2ddbcdf3a7
Pass TARGET_BUILD_PDK to soong
...
Also enable ALLOW_MISSING_DEPENDENCIES when TARGET_BUILD_PDK is set
so that soong modules can reference modules that are disabled in the
PDK.
Test: builds
Bug: 62086238
Change-Id: Ic43e843a717b802ace0cee568b9e7e561a6c0868
2017-05-25 10:29:19 -07:00
97479ccb7f
Desugar: allow reflection over internal APIs.
...
Desugar reflects over internal APIs at runtime, using the
java.lang.invoke.MethodHandles.Lookup API.
On OpenJDK 9 toolchains, such reflection is only allowed
to packages to which the java.lang.invoke module is opened.
This CL adds an override to open the module to all unnamed
modules (i.e., to Desugar) when running Desugar.
Test: make checkbuild
(with OpenJDK 8u45 toolchain on the PATH)
Test: make EXPERIMENTAL_USE_OPENJDK9=true checkbuild
(with OpenJDK 9-ea toolchain on the PATH)
Bug: 38177295
Change-Id: I2cf74a96ea17366dd50b8d92af8e41e812247ef7
2017-05-25 18:14:27 +01:00
5e5b28da9c
Merge "Export OVERRIDE_RS_DRIVER to soong" into oc-dev
...
am: 9b28c2eb0b
2017-05-24 22:13:23 +00:00
c0578be0cc
Export OVERRIDE_RS_DRIVER to soong
...
am: f4c5e3cd8b
2017-05-24 22:11:35 +00:00
9b28c2eb0b
Merge "Export OVERRIDE_RS_DRIVER to soong" into oc-dev
2017-05-24 22:06:16 +00:00
4db7b3ef88
Merge "Include Treble metadata on Treble enabled devices" into oc-dev
...
am: 7858d310ce
2017-05-24 21:55:25 +00:00
d1dd861eda
Merge "Add ro.treble.enabled" into oc-dev
...
am: 84cbb4e903
2017-05-24 21:45:56 +00:00
7858d310ce
Merge "Include Treble metadata on Treble enabled devices" into oc-dev
2017-05-24 21:35:01 +00:00
84cbb4e903
Merge "Add ro.treble.enabled" into oc-dev
2017-05-24 21:34:13 +00:00
5a64925af7
Merge "Drop build support for LEGACY_USE_JAVA7." am: 5368131063 am: 28be9906d4
...
am: 7d8194becd
2017-05-24 10:33:33 +00:00
7d8194becd
Merge "Drop build support for LEGACY_USE_JAVA7." am: 5368131063
...
am: 28be9906d4
2017-05-24 10:31:03 +00:00
28be9906d4
Merge "Drop build support for LEGACY_USE_JAVA7."
...
am: 5368131063
2017-05-24 10:28:03 +00:00
5368131063
Merge "Drop build support for LEGACY_USE_JAVA7."
2017-05-24 10:24:53 +00:00
7ea994b21c
Support signing custom images with AVB HASH or AVB HASHTREE
...
`make custom_images` supports to build different kinds of *non-droid* images,
e.g., odm.img. Adding the support of signing them with either AVB HASH footer
or AVB HASHTREE footer. The user can use HASH for small images and
HASHTREE for large images.
Sample signing configurations:
* AVB HASH footer:
- CUSTOM_IMAGE_AVB_HASH_ENABLE := true
- CUSTOM_IMAGE_AVB_ADD_HASH_FOOTER_ARGS := --append_to_release_string my_odm_image
* AVB HASHTREE footer:
- CUSTOM_IMAGE_AVB_HASHTREE_ENABLE := true
- CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS := --fec_num_roots 8
* Using custom signing key:
- CUSTOM_IMAGE_AVB_ALGORITHM := SHA256_RSA2048
- CUSTOM_IMAGE_AVB_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
Bug: 36701014
Test: `make custom_images` with AVB HASH footer
Test: `make custom_images` with AVB HASHTREE footer
Test: `make droid` to check system.img is still properly signed with AVB HASHTREE
Test: `make droid` to check vendor.img is still properly signed with AVB HASHTREE
Change-Id: I8dc420e12e37e9a631345c0cd883339db05d489f
2017-05-24 14:21:03 +08:00
4a05738a8e
Merge "Fix override warnings when two test suites share an output" am: 5f4274609f am: a0d3365510
...
am: 9f64ca8413
2017-05-24 03:41:33 +00:00
9f64ca8413
Merge "Fix override warnings when two test suites share an output" am: 5f4274609f
...
am: a0d3365510
2017-05-24 03:38:33 +00:00
a0d3365510
Merge "Fix override warnings when two test suites share an output"
...
am: 5f4274609f
2017-05-24 03:36:02 +00:00
5f4274609f
Merge "Fix override warnings when two test suites share an output"
2017-05-24 03:32:21 +00:00
f4c5e3cd8b
Export OVERRIDE_RS_DRIVER to soong
...
Bug: 37035983
Test: examine RS cflags
Change-Id: I0c1cc54f3f7f860895322d2825c7168c93a84ef5
Merged-In: I0c1cc54f3f7f860895322d2825c7168c93a84ef5
(cherry picked from commit 7932f9bc5d
2017-05-23 20:22:22 -07:00
e8ef8f70f8
Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE.
...
$ lunch aosp_marlin-userdebug
$ m otatools-package
$ echo "TEST" >> device/google/marlin/sepolicy/certs/app.x509.pem
$ m otatools-package
out/target/product/marlin/otatools.zip now contains an updated
app.x509.pem file.
Test: see above
Change-Id: I78a165e12a07c1b86a671a7ee1863a97fdea18c5
2017-05-23 18:25:29 -07:00
988a08d009
Fix override warnings when two test suites share an output
...
Test: (internal master); m -j nothing, check warnings
Test: Spot check differences in build-*.ninja
Change-Id: I160583faa69d090f9b97a8a600598a39a8b1ed9c
2017-05-24 00:42:23 +00:00
6a324ba588
Remove the obsolete UnpackPackageDir() in edify generator
...
package_extract_dir is used in file based OTA only and should be killed.
Bug: 37959785
Test: code search shows no usage of this function in aosp.
Change-Id: Id3719b969c24b7ecef0c7f0e4a3af09a72be54d4
2017-05-23 17:15:14 -07:00
b05bfaa05c
Merge "Switch to a shell_and_utilities phony module." into oc-dev
...
am: 24011de5d5
2017-05-23 23:36:22 +00:00
5a3994eb1b
Switch to a shell_and_utilities phony module.
...
am: 98352342b3
2017-05-23 23:32:23 +00:00
24011de5d5
Merge "Switch to a shell_and_utilities phony module." into oc-dev
2017-05-23 23:02:29 +00:00
50ecd4abf2
Merge "Move dataclean and installclean to soong_ui" am: 5d80b734f2 am: 303a902ac6
...
am: 5851c47ec0
2017-05-23 22:48:42 +00:00
5851c47ec0
Merge "Move dataclean and installclean to soong_ui" am: 5d80b734f2
...
am: 303a902ac6
2017-05-23 22:45:42 +00:00
303a902ac6
Merge "Move dataclean and installclean to soong_ui"
...
am: 5d80b734f2
2017-05-23 22:41:07 +00:00
5d80b734f2
Merge "Move dataclean and installclean to soong_ui"
2017-05-23 22:32:34 +00:00
779bab63f0
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6 am: a09b52458b am: 5bfb914572 am: 1dc5d62e32
...
am: b6fdf67bff
2017-05-23 20:50:02 +00:00
65ebcf9283
Merge "Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours am: e11f92cdb3 am: 636552bdad am: e0479f6bc9 am: faab4b05e8" into oc-dev
...
am: 91aa4f6e97
2017-05-23 20:44:52 +00:00
b6fdf67bff
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6 am: a09b52458b am: 5bfb914572
...
am: 1dc5d62e32
2017-05-23 20:44:31 +00:00
91d92794fb
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 5ae680c1f6 am: bfc689cbfa
...
am: 92937e0f0d
2017-05-23 20:44:31 +00:00
071bca518d
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 5ae680c1f6 am: bfc689cbfa
...
am: abe2e1a328
2017-05-23 20:42:52 +00:00
8176435968
Merge "Makefile: copy mke2fs.conf to ota root" am: d5f8deb3ac am: 5ce1b40d4e
...
am: 947c43cbc1
2017-05-23 20:42:30 +00:00
1dc5d62e32
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6 am: a09b52458b
...
am: 5bfb914572
2017-05-23 20:42:29 +00:00
91aa4f6e97
Merge "Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours am: e11f92cdb3 am: 636552bdad am: e0479f6bc9 am: faab4b05e8" into oc-dev
2017-05-23 20:40:21 +00:00
abe2e1a328
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 5ae680c1f6
...
am: bfc689cbfa
2017-05-23 20:40:01 +00:00
92937e0f0d
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 5ae680c1f6
...
am: bfc689cbfa
2017-05-23 20:40:01 +00:00
5bfb914572
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085 am: 73452ebcd6
...
am: a09b52458b
2017-05-23 20:40:00 +00:00
6b8fc2cd5c
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours am: e11f92cdb3 am: 636552bdad am: e0479f6bc9
...
am: faab4b05e8
2017-05-23 20:40:00 +00:00
bfc689cbfa
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085
...
am: 5ae680c1f6
2017-05-23 20:37:31 +00:00
a09b52458b
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45 am: 9e9542d085
...
am: 73452ebcd6
2017-05-23 20:37:30 +00:00
faab4b05e8
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours am: e11f92cdb3 am: 636552bdad
...
am: e0479f6bc9
2017-05-23 20:37:30 +00:00
5ae680c1f6
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45
...
am: 9e9542d085
2017-05-23 20:35:31 +00:00
73452ebcd6
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466 am: ffb37ffc45
...
am: 9e9542d085
2017-05-23 20:35:30 +00:00
e0479f6bc9
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours am: e11f92cdb3
...
am: 636552bdad
2017-05-23 20:35:30 +00:00
9e9542d085
Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360 am: f5c749c512 am: def58d6dec am: 16af70a949 -s ours am: 2f755b5466
...
am: ffb37ffc45
2017-05-23 20:33:00 +00:00
5050760ac7
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 am: fe5a42c88d am: 11c1846444 -s ours
...
am: 33922bc860
2017-05-23 20:33:00 +00:00
636552bdad
Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 -s ours
...
am: e11f92cdb3
2017-05-23 20:32:59 +00:00
Colin Cross