Zhenhuang Wang
8795c16f30
Merge "Export test_options.tags to module-info" am: aa6a6a4f36
am: adfe90de1f
am: bb6c3bf224
am: e5dbce3e80
am: 183cc0daf2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176502
Change-Id: I21b296d99e34150f7b71197b9e7dada9f0f64370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:55:57 +00:00
Zhenhuang Wang
bb6c3bf224
Merge "Export test_options.tags to module-info" am: aa6a6a4f36
am: adfe90de1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176502
Change-Id: I13ae3bc0f53203221bf5c1a104f2fe68c4dc98a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 04:29:50 +00:00
Zhenhuang Wang
415ee12c76
Export test_options.tags to module-info
...
The test_options.tags attribute modifies execution behavior when running
tests in ATest Bazel mode. Exporting the value to module-info enables
ATest to add them to the corresponding Bazel target.
Bug: 240928948
Test: manually add `test_options.tags` attribute and run:
$ refreshmod && \
cat out/target/product/generic/module-info.json |\
grep <tags>
Change-Id: I1a70d5c66703ed6a5a250459a80e8bca71d659b6
2022-08-22 20:59:54 +08:00
Hung-Wei Chen
ed1d0bfa51
Merge "Remove VB related code" am: 8dec280fec
am: 8ba226a69c
am: 665bfe387b
am: 2e95391a95
am: ebe1f51b69
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695
Change-Id: I26d915ba99f6ceecbb0603f86e0c7b26835d58b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 07:29:36 +00:00
Hung-Wei Chen
665bfe387b
Merge "Remove VB related code" am: 8dec280fec
am: 8ba226a69c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2188695
Change-Id: I13a370191981ec768ae6c8d73afa5ab5d5554fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-22 06:06:38 +00:00
Hung-Wei Chen
8dec280fec
Merge "Remove VB related code"
2022-08-22 05:25:07 +00:00
Treehugger Robot
f25f0852a6
Merge "Add project specific definitions.mk files" am: a0827dcb0e
am: 4b3d38658a
am: e59fce2005
am: 251b5098c6
am: 93533f0374
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578
Change-Id: Ia5f2e6aa6aedb98baa25c14e42206202fb618942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 18:38:06 +00:00
Treehugger Robot
e59fce2005
Merge "Add project specific definitions.mk files" am: a0827dcb0e
am: 4b3d38658a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2189578
Change-Id: I9385e4a44777e45163cb52626effc2d09d92c618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-19 17:30:13 +00:00
Greg Kaiser
85518aceab
Add project specific definitions.mk files
...
Just like we do with build/tasks/*.mk, we also look for project
specific definitions.mk files.
Test: TreeHugger
Bug: 243024627
Change-Id: I7f07546582eb02bba245a1f927a11efc1ddc3c6f
2022-08-18 12:22:15 -07:00
Steven Moreland
410e5f35d1
Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4
am: 731d649089
am: 5e882374d2
am: 9f9829dad8
am: b6ca460eb9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603
Change-Id: I801167e01f88a03868be2ece295f98189d8b1bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 20:55:34 +00:00
Steven Moreland
5e882374d2
Merge "BOARD_VNDK_VERSION always by default" am: 34570d33f4
am: 731d649089
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175603
Change-Id: I3449c41d09be835526094ed0d0f3fbff335ad1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 19:45:03 +00:00
Steven Moreland
34570d33f4
Merge "BOARD_VNDK_VERSION always by default"
2022-08-17 18:43:37 +00:00
Hung-Wei Chen
d194b86fd1
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
am: cb7c04f783
am: f44646461d
am: 653425238b
am: 1a2b5f7b91
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: I9be6e54fdcfb684dc11585f4aecc1aff67feeedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 16:50:16 +00:00
Treehugger Robot
469220d8e9
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
am: 8c90005ff0
am: 19ca755ba3
am: cdf1a82100
am: 8c390da2c2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: I93cf0830525c90e14b285e9c366bcda0eb49f931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 16:41:37 +00:00
Yifan Hong
b8df917479
Merge "Support GKI with non-A/B recovery" am: e6f92d1411
am: f19cd6f89f
am: 74d1aa231c
am: a766297fed
am: c6660a606d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837
Change-Id: I5ef9680c290f7fbf00ebc30f3a47b3323dcabf96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 13:37:22 +00:00
Treehugger Robot
45cb03f3a0
Merge "Add mainline dev certificate dir to config" am: 22907b7777
am: 78ca053052
am: f3fa9ed0e9
am: 36074148eb
am: fb79320b12
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338
Change-Id: Id72d4f791b327dbf900c3b6f910e1d27d279a36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 12:55:23 +00:00
hungweichen
f1f5dd3011
Remove VB related code
...
Cleaning up the related references of VB in Makefile
Bug: 241044073
Change-Id: I9e0ec9d433f2e76951c4390f716cf77674174930
2022-08-17 08:52:17 +00:00
Hung-Wei Chen
f44646461d
Merge changes Ifbcde7da,Icee659ff,I267da2d5 am: a7dfb456a1
am: cb7c04f783
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2176952
Change-Id: Id90490fac6fcd6476f4e9d6d244ed40eb89a44c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 04:04:28 +00:00
Hung-Wei Chen
a7dfb456a1
Merge changes Ifbcde7da,Icee659ff,I267da2d5
...
* changes:
Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Treehugger Robot
19ca755ba3
Merge "Suppress R8 warnings for support library annotations" am: 2dca04c64d
am: 8c90005ff0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2182775
Change-Id: Icc3c7290110fadf0cbc6a6ed9850dfb7130b975d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-17 01:13:31 +00:00
Treehugger Robot
2dca04c64d
Merge "Suppress R8 warnings for support library annotations"
2022-08-17 00:07:51 +00:00
Steve Berbary
4f21b86ea4
Update Security String to 2022-10-05 am: 763c03967e
am: 83d72b7d39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: I27bcfae4636abb0b09445479e14848cc8abcc0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 21:24:28 +00:00
Steve Berbary
83d72b7d39
Update Security String to 2022-10-05 am: 763c03967e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: I93ea8dc595de4366198539bfbc7b62586c1e14a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 21:01:36 +00:00
Steve Berbary
e01df6fce7
Update Security String to 2022-10-05 am: 763c03967e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19633096
Change-Id: Ic17372e81b55d5c345a5656e7be7f72b2cbc1242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-16 20:59:26 +00:00
Jared Duke
3ca564b047
Suppress R8 warnings for support library annotations
...
Most of these annotations are stripped at dex compile-time, and are not
necessarily present in the generated dex library's classpath. As the
classpath is used to inform R8 about `libraryjars`, this can cause
reference failures during R8 execution when warnings are enabled.
For now, suppress the reference warnings. Unrecognized runtime-visible
annotations will still be kept, and this should unblock efforts to
re-enable R8 warnings for many platform targets. A proper solution will
be to ensure the appropriate annotation libs are fed as `-libraryjars`
to R8.
Bug: 242088131
Test: m + `optimize { ignore_warnings: false }`
Change-Id: Ie92db2a9725ff520b311c6b66a50feae79463925
2022-08-16 08:49:36 -07:00
Steve Berbary
763c03967e
Update Security String to 2022-10-05
...
Bug: 242323332
Change-Id: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
2022-08-16 03:39:28 +00:00
Yifan Hong
74d1aa231c
Merge "Support GKI with non-A/B recovery" am: e6f92d1411
am: f19cd6f89f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837
Change-Id: I6140d46bca91037328111eaa5f51200d66897191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-15 21:51:03 +00:00
Yifan Hong
f19cd6f89f
Merge "Support GKI with non-A/B recovery" am: e6f92d1411
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837
Change-Id: Ieb4ea09d84477f3f14f02a04eac44f3cef7c2ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-15 21:30:31 +00:00
Yifan Hong
e6f92d1411
Merge "Support GKI with non-A/B recovery"
2022-08-15 20:34:10 +00:00
Treehugger Robot
f3fa9ed0e9
Merge "Add mainline dev certificate dir to config" am: 22907b7777
am: 78ca053052
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338
Change-Id: Ib10bf5e97a6965927a03158da56b9329ba12ebe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-15 11:51:37 +00:00
Treehugger Robot
78ca053052
Merge "Add mainline dev certificate dir to config" am: 22907b7777
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338
Change-Id: I1cfbe21e29145e2e8e0d5d70db921147467b3684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-15 11:25:19 +00:00
Inseob Kim
7b4d76700d
Add mainline dev certificate dir to config
...
Bug: 33691272
Test: build
Change-Id: Iea4d96ab9c58a1be6d25aff4c0cf91cfc097470e
2022-08-12 21:35:45 +09:00
celeste wang
e3d43208d9
Support GKI with non-A/B recovery
...
Using BOARD_PREBUILT_BOOTIMAGE instead of TARGET_NO_KERNEL to determine prebuilt boot.img.
So kernel is not excluded from recovery.img.
Bug: 187157581
Change-Id: I4163c8093c52b01d97db3cdb4f9daf840a27c23a
Test: make target-files-package
2022-08-12 08:39:22 +00:00
Nick Kovacs
4c22e6060e
Merge "Update minimum supported targetSdk to 29"
2022-08-11 19:26:33 +00:00
hungweichen
e3ca398a1e
Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
...
verity.mk is used to set the related variable for VB 1.0 support, but
we already removed VB 1.0. This change removes the unused code. We also
remove and block PRODUCT_VERITY_SIGNING_KEY in this change.
Bug: 241044073
Test: atest under build/make
Change-Id: Ifbcde7da27a931ef3b9d746b1c5a279d88c0ec85
2022-08-11 08:12:58 +00:00
hungweichen
bf11e34897
Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
...
PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.
Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
2022-08-11 08:12:58 +00:00
hungweichen
b2dd683421
Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
...
These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.
Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
2022-08-11 08:12:58 +00:00
Treehugger Robot
9ad2945fdd
Merge "Add jdduke to OWNERS for global Proguard rules" am: 4b88416c81
am: a5c72ff120
am: ad2451fdc9
am: 26d4db7315
am: 9f79a4ff73
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2174763
Change-Id: Idc6b46aff46e8ea82c6da83718b19ea15e90cd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 03:34:05 +00:00
Treehugger Robot
ad2451fdc9
Merge "Add jdduke to OWNERS for global Proguard rules" am: 4b88416c81
am: a5c72ff120
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2174763
Change-Id: I4f730d4d5971aa841cbf813a0ba3f6c033a482f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 01:20:44 +00:00
Treehugger Robot
a5c72ff120
Merge "Add jdduke to OWNERS for global Proguard rules" am: 4b88416c81
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2174763
Change-Id: I67eada413140bda361e73faa44496ff4337f0476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-11 00:57:03 +00:00
Treehugger Robot
4b88416c81
Merge "Add jdduke to OWNERS for global Proguard rules"
2022-08-11 00:31:46 +00:00
zhidou
00ea5ee7f5
Ensure runtime-visible annotations are kept
...
With R8 full mode, these annotations must be explicitly kept as
attributes. Also keep annotation defaults as they may be used at
runtime.
Test: m + presubmit
Bug: 233746531
Merged-In: Ibab630cd8498c5789ebcad6785fda24967df4d61
Change-Id: Icf2cddf89d06d29bdbd000a8216d1b975b5f49d8
2022-08-10 14:48:23 +00:00
David Anderson
adc1a414bc
Merge "Remove dynamic partition allowlist check" am: 93ff78f3ca
am: 0d4df8b638
am: 655e9bbe0c
am: afa9e531b7
am: f7d51d8636
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175686
Change-Id: I8ac8347cbf64230dae5571377c8d5834d234d2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 05:55:56 +00:00
Treehugger Robot
468e4e83a3
Merge "Use aapt2" am: 07c507b519
am: 2cf5c43709
am: 9fcfb948c7
am: dd2d5a9541
am: 790c60560b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2178694
Change-Id: I087191e7d88c01046ebc15a0b81fbb24eb0612b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 04:27:19 +00:00
David Anderson
655e9bbe0c
Merge "Remove dynamic partition allowlist check" am: 93ff78f3ca
am: 0d4df8b638
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175686
Change-Id: I5d6895aba2b990e17dc72e814d5166dac31796d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 04:19:25 +00:00
David Anderson
0d4df8b638
Merge "Remove dynamic partition allowlist check" am: 93ff78f3ca
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2175686
Change-Id: If3936f5194f08919701fa7f4aa78cc1d302cf192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 04:01:20 +00:00
David Anderson
93ff78f3ca
Merge "Remove dynamic partition allowlist check"
2022-08-10 03:20:56 +00:00
Treehugger Robot
9fcfb948c7
Merge "Use aapt2" am: 07c507b519
am: 2cf5c43709
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2178694
Change-Id: I4017b58d9ba2a902b0492bff63141f2632aefe16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 02:35:13 +00:00
Treehugger Robot
2cf5c43709
Merge "Use aapt2" am: 07c507b519
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2178694
Change-Id: Ifbbbb693b727b44aa42e7f492a7ce55e5333f71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-10 02:17:45 +00:00
Treehugger Robot
07c507b519
Merge "Use aapt2"
2022-08-10 01:21:11 +00:00