Commit Graph

33811 Commits

Author SHA1 Message Date
Zhenhuang Wang
9544346d39 Merge "Enable -sha256 feature to some Soong built zip files" 2023-02-10 08:00:44 +00:00
Steve Berbary
641c8e9c6b Update Security String to 2023-04-01
Bug: 268558932

Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-10 03:26:16 +00:00
Steve Berbary
baf6b726c4 Update Security String to 2023-04-01
Bug: 268558932

Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-10 03:23:58 +00:00
Steve Berbary
c29c047fd1 Update Security String to 2023-04-05
Bug: 268558932
Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-10 03:21:04 +00:00
Jiakai Zhang
f22c016e6f Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5 am: ae60455886 am: 48f6a8799c
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694

Change-Id: I8c4e30f66e548818a787574d722187fd46aa40b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 16:12:27 +00:00
Jiakai Zhang
48f6a8799c Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5 am: ae60455886
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694

Change-Id: I102e7a9acb39048656309a87daa70cce879516e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 15:21:55 +00:00
Jiakai Zhang
ae60455886 Merge "Revert "Don't disable dexpreopt for an unbundled build."" am: 9964bf51e5
Original change: https://android-review.googlesource.com/c/platform/build/+/2428694

Change-Id: If189521931a7dd959f260ef1408799550bb54c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 14:42:57 +00:00
Jiakai Zhang
9964bf51e5 Merge "Revert "Don't disable dexpreopt for an unbundled build."" 2023-02-09 14:01:59 +00:00
Treehugger Robot
02dac4cd14 Merge "Migrate to the new clang lib dir" am: 99014b038c am: f8149c5688 am: a32e210dfd
Original change: https://android-review.googlesource.com/c/platform/build/+/2428752

Change-Id: Icf8b74c7eb1f6af4d6f25db6f3155ca319eb7bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 13:01:48 +00:00
Jiakai Zhang
60c08f24a7 Revert "Don't disable dexpreopt for an unbundled build."
This reverts commit d5d8904e52.

Reason for revert: Maybe broke the build on git_stage-aosp-master on mainline_modules_x86_64-userdebug

Change-Id: Ia33a642abda127b43aa6e265deb43dca7ee04f34
2023-02-09 12:56:59 +00:00
Treehugger Robot
a32e210dfd Merge "Migrate to the new clang lib dir" am: 99014b038c am: f8149c5688
Original change: https://android-review.googlesource.com/c/platform/build/+/2428752

Change-Id: I2f491d8022861a5c65b488d9d4bfff34c343e330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 12:13:10 +00:00
Treehugger Robot
f8149c5688 Merge "Migrate to the new clang lib dir" am: 99014b038c
Original change: https://android-review.googlesource.com/c/platform/build/+/2428752

Change-Id: I87a3b04cad809bb5f8eb7d4fd6f08ef34d304530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 11:32:01 +00:00
Yi Kong
e4b8f48a6d Migrate to the new clang lib dir
Test: presubmit
Change-Id: Ib409725d540d285dfd840bcd3de33020218f3bc0
2023-02-09 15:17:04 +09:00
Jiakai Zhang
13be1e03cd Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5 am: 8f1a701b8f am: cb3836fe52
Original change: https://android-review.googlesource.com/c/platform/build/+/2425454

Change-Id: I878d94b242b70ae22b5c1f83fc2c618233b99e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 19:34:41 +00:00
Jiakai Zhang
cb3836fe52 Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5 am: 8f1a701b8f
Original change: https://android-review.googlesource.com/c/platform/build/+/2425454

Change-Id: Idc4159e23bff8d1f3806aa293b26bd0334198bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:47:05 +00:00
Jiakai Zhang
8f1a701b8f Merge "Don't disable dexpreopt for an unbundled build." am: 0a3f6a2bb5
Original change: https://android-review.googlesource.com/c/platform/build/+/2425454

Change-Id: Ib352612a51574c623334cd670d7762125469fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 18:16:35 +00:00
Jiakai Zhang
0a3f6a2bb5 Merge "Don't disable dexpreopt for an unbundled build." 2023-02-08 17:39:51 +00:00
Treehugger Robot
a154b87205 Merge "Merge TQ1A.230205.002" 2023-02-08 10:40:37 +00:00
Treehugger Robot
06812479a7 Merge "Use the init_boot partition name with avb for prebuilt" am: 5683ef1934 am: 288f5ca642 am: 9ac428ed2e
Original change: https://android-review.googlesource.com/c/platform/build/+/2422906

Change-Id: Iad51d7e73eb56111be2cfe9c6aebb1b146ec088c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:52:54 +00:00
Treehugger Robot
7b4a8b1426 Merge "Make words() work on a list of non-strings" am: 6086c5ce5f am: 780964e41b am: 3c35c4651f
Original change: https://android-review.googlesource.com/c/platform/build/+/2424056

Change-Id: I954152e4876f13318e75ce8acca7bdccc8bb9d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:52:15 +00:00
Treehugger Robot
9ac428ed2e Merge "Use the init_boot partition name with avb for prebuilt" am: 5683ef1934 am: 288f5ca642
Original change: https://android-review.googlesource.com/c/platform/build/+/2422906

Change-Id: I9c98ac1ece002eb3b058756612b91245d39c354c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:47:11 +00:00
Treehugger Robot
288f5ca642 Merge "Use the init_boot partition name with avb for prebuilt" am: 5683ef1934
Original change: https://android-review.googlesource.com/c/platform/build/+/2422906

Change-Id: I56de457de93fcc36ecab79390c6b4ad908c643eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:08:43 +00:00
Treehugger Robot
3c35c4651f Merge "Make words() work on a list of non-strings" am: 6086c5ce5f am: 780964e41b
Original change: https://android-review.googlesource.com/c/platform/build/+/2424056

Change-Id: Iac819fd11cbc461d6987931d9f6143fa378bc61f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 02:01:53 +00:00
Treehugger Robot
5683ef1934 Merge "Use the init_boot partition name with avb for prebuilt" 2023-02-08 01:38:11 +00:00
Treehugger Robot
780964e41b Merge "Make words() work on a list of non-strings" am: 6086c5ce5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2424056

Change-Id: I74650b2b2d7800d509f2fb558a242df8664b1377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 01:25:10 +00:00
Treehugger Robot
6086c5ce5f Merge "Make words() work on a list of non-strings" 2023-02-08 00:52:24 +00:00
Cole Faust
2b5b3f3be8 Make words() work on a list of non-strings
words() attempts to join all the elements of a list
and then resplit them to more closely match make.
But sometimes, like when calling words() on a product
variable, not all of the elements are strings. In
that case, just return the list unchanged.

Bug: 267407943
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I738d0c86c8935f446807cc79623f796e8cae3c01
2023-02-07 12:28:47 -08:00
Jiakai Zhang
d5d8904e52 Don't disable dexpreopt for an unbundled build.
Dexpreopt generates profiles that need to be installed in the APEX.
Soong will skip the dex2oat step after it generates the build rule for
profiles.

Bug: 241823638
Test: -
  1. Patch ag/20581649 PS2.
  2. banchan com.android.btservices x86_64 && m
  3. Check that "javalib/service-bluetooth.jar.prof" exists in the APEX.
Change-Id: I5cad1b0e1027935fd78e80ad7b07e039f7b8d432
2023-02-08 03:47:24 +08:00
Xin Li
fc740c9920 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Change-Id: I6c6ce54d95ea5b44d4907a710e36f2fcd80991a6
2023-02-06 21:07:34 -08:00
Devin Moore
77ae07dc5b Use the init_boot partition name with avb for prebuilt
When building a target with a prebuilt init_boot image, we still need to
use the correct name for the image.

Test: m
Bug: 268050089
Change-Id: I8fd11d8c17c2c140b7cff1dd8255c8b8728ea196
2023-02-06 17:25:06 +00:00
Android Build Coastguard Worker
f159d350f6 Version bump to TQ2A.230305.007 [core/build_id.mk]
Change-Id: Iec89798bdc3314925f92cc0e47d31ce32b11adb8
2023-02-04 03:50:22 +00:00
Jared Duke
47ea46f8c4 Merge "Further refine VisibleForTesting rules" am: 7e559f9c24 am: 9976b4bbe6 am: 25a295e208
Original change: https://android-review.googlesource.com/c/platform/build/+/2415814

Change-Id: If594908f0db9e3a06a0cb73d8974597cf106a3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 22:15:21 +00:00
Android Build Coastguard Worker
d4baf72ab6 Version bump to TQ2A.230305.006 [core/build_id.mk]
Change-Id: Ie60b11a927007ad9571eda1f6b094fb68d275d81
2023-02-02 21:52:30 +00:00
Jared Duke
25a295e208 Merge "Further refine VisibleForTesting rules" am: 7e559f9c24 am: 9976b4bbe6
Original change: https://android-review.googlesource.com/c/platform/build/+/2415814

Change-Id: Id4f0d8eab83cb192e890e5bf8886d9b40c0e4613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:39:51 +00:00
Jared Duke
9976b4bbe6 Merge "Further refine VisibleForTesting rules" am: 7e559f9c24
Original change: https://android-review.googlesource.com/c/platform/build/+/2415814

Change-Id: Id681d9ac8b5566f56e820216bffe75a4491e3776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 20:54:27 +00:00
Jared Duke
7e559f9c24 Merge "Further refine VisibleForTesting rules" 2023-02-02 16:34:49 +00:00
Jared Duke
da0d73e580 Further refine VisibleForTesting rules
Additional analysis revealed more edge cases where external library
code was getting kept unnecessarily. Further refine the keep rules to
avoid these cases. Now, we only apply keep globally for the
`com.android.internal.annotations.VisibleForTesting` annotation.

VisibleForTesting annotations defined externally (e.g., by androidx or
guava) will *only* be respected in platform-defined packages. This
helps trim unused code from deps like gRPC and Dagger, saving up to
~hundreds of KB per package that uses these libraries.

Bug: 248580093
Test: m + verify exclusion of external test code (e.g., from dagger)
Change-Id: Iab7559c08d3ae1ac74f18e3cf3a1b4828a3736cf
2023-02-02 16:33:34 +00:00
Sam Delmerico
f564f8bb4b Merge "Revert "remove unneeded dontwarn settings"" am: 7f6fc715ba am: 1fce1d0d1e am: bd4409598e
Original change: https://android-review.googlesource.com/c/platform/build/+/2412692

Change-Id: I7a310a6913dfed3b7db1b327a6b1410c77d2ceca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 17:56:23 +00:00
Sam Delmerico
bd4409598e Merge "Revert "remove unneeded dontwarn settings"" am: 7f6fc715ba am: 1fce1d0d1e
Original change: https://android-review.googlesource.com/c/platform/build/+/2412692

Change-Id: Ife23a55e2adff247619cc0af6f9309440da6cdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 17:19:25 +00:00
Sam Delmerico
1fce1d0d1e Merge "Revert "remove unneeded dontwarn settings"" am: 7f6fc715ba
Original change: https://android-review.googlesource.com/c/platform/build/+/2412692

Change-Id: Ic924e106dd68e55607324f43607bda54dd0b7089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 16:45:01 +00:00
Sam Delmerico
7f6fc715ba Merge "Revert "remove unneeded dontwarn settings"" 2023-02-01 16:01:32 +00:00
Sam Delmerico
4731ab7282 Revert "remove unneeded dontwarn settings"
This reverts commit 59570d1e64.

Reason for revert: we still need these flags

Change-Id: I8caa6350f0b62e6aa2a190e128d5ce7d8f849ea8
2023-01-31 20:14:18 +00:00
Eran Messeri
b65879592f Merge "AOSP: Added new properties for attestation" am: 1f5aa11437 am: 6d2a5f431c am: 633dfa6ccd
Original change: https://android-review.googlesource.com/c/platform/build/+/2237054

Change-Id: Iae2feb6bacc71e984cc47f5b802cdd48445ecc73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 19:12:50 +00:00
Eran Messeri
633dfa6ccd Merge "AOSP: Added new properties for attestation" am: 1f5aa11437 am: 6d2a5f431c
Original change: https://android-review.googlesource.com/c/platform/build/+/2237054

Change-Id: I4f5b52ba5bebbb8902b8c9c4c2b13c1bd60c3b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 17:41:11 +00:00
Eran Messeri
6d2a5f431c Merge "AOSP: Added new properties for attestation" am: 1f5aa11437
Original change: https://android-review.googlesource.com/c/platform/build/+/2237054

Change-Id: Ie43c9b857d3456992d16956369c00ef7a88b9850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 16:59:07 +00:00
Eran Messeri
1f5aa11437 Merge "AOSP: Added new properties for attestation" 2023-01-31 13:43:55 +00:00
Android Build Coastguard Worker
4e953c95a1 Version bump to TQ2A.230305.005 [core/build_id.mk]
Change-Id: I3236c2fbd10722113998510857e94c0ce0e28e08
2023-01-28 02:57:33 +00:00
Treehugger Robot
f53facfc96 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" am: 43cbca31e6 am: a16bae6627 am: 069970eaaf
Original change: https://android-review.googlesource.com/c/platform/build/+/2403126

Change-Id: I635b9a2c7552eb467a212c5d0f1def38f5377b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-28 00:25:54 +00:00
Treehugger Robot
069970eaaf Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" am: 43cbca31e6 am: a16bae6627
Original change: https://android-review.googlesource.com/c/platform/build/+/2403126

Change-Id: Ic55c92dcafa40ee66a02624a73843c971136d82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-28 00:20:07 +00:00
Treehugger Robot
a16bae6627 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" am: 43cbca31e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2403126

Change-Id: Idc3e93781f7f349a68e62b762aee8c397e5184a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 23:43:10 +00:00