Commit graph

33609 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
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
Treehugger Robot
43cbca31e6 Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" 2023-01-27 22:55:58 +00:00
Dennis Shen
98d230d9b7 Merge "Set soong config variable TrimmedApex" am: ef83ce6a79 am: 80c8a4d1ac am: 3d7e2c0381
Original change: https://android-review.googlesource.com/c/platform/build/+/2384472

Change-Id: Ib4f2e7f091b1209092aa5beed638b2cf371807fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:54:23 +00:00
Shikha Panwar
b4187b2bc8 Merge "Include initrd_bootconfig in the list of OTA tools" am: 44eccdd471 am: 1d1902941b am: 20bbea9b28
Original change: https://android-review.googlesource.com/c/platform/build/+/2387652

Change-Id: I343415d8c5009f5d3acf416f9fbdd25b0d18c4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:53:48 +00:00
Dennis Shen
3d7e2c0381 Merge "Set soong config variable TrimmedApex" am: ef83ce6a79 am: 80c8a4d1ac
Original change: https://android-review.googlesource.com/c/platform/build/+/2384472

Change-Id: I022819119399007365c3bcc15bb3fe53b1081388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:12:28 +00:00
Shikha Panwar
20bbea9b28 Merge "Include initrd_bootconfig in the list of OTA tools" am: 44eccdd471 am: 1d1902941b
Original change: https://android-review.googlesource.com/c/platform/build/+/2387652

Change-Id: I410cc4234d7ff497bd94c2c85fd76f2407196844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 21:09:16 +00:00
Dennis Shen
80c8a4d1ac Merge "Set soong config variable TrimmedApex" am: ef83ce6a79
Original change: https://android-review.googlesource.com/c/platform/build/+/2384472

Change-Id: I5617875e10fcefd7955cea3789033d1f08555d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:22:09 +00:00
Shikha Panwar
1d1902941b Merge "Include initrd_bootconfig in the list of OTA tools" am: 44eccdd471
Original change: https://android-review.googlesource.com/c/platform/build/+/2387652

Change-Id: I14a532bf92c2a4a6288eadce2de0805b22ce0c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 20:21:24 +00:00
Android Build Coastguard Worker
fa6e951a7d Version bump to TQ2A.230305.004 [core/build_id.mk]
Change-Id: I17ee94c0986c461684e7f987552878bd05876912
2023-01-27 18:39:50 +00:00
Dennis Shen
ef83ce6a79 Merge "Set soong config variable TrimmedApex" 2023-01-27 13:11:50 +00:00
Shikha Panwar
44eccdd471 Merge "Include initrd_bootconfig in the list of OTA tools" 2023-01-27 12:11:10 +00:00
Vincent Donnefort
c34ef980ce Merge "Add null and console dev nodes to the Android initramfs" am: 6133aea40f am: 03130d98e4 am: 415217c94e
Original change: https://android-review.googlesource.com/c/platform/build/+/2368008

Change-Id: Iab5d97253000936bb1d30ae85453d89d09ea7fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 11:17:12 +00:00
Vincent Donnefort
415217c94e Merge "Add null and console dev nodes to the Android initramfs" am: 6133aea40f am: 03130d98e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2368008

Change-Id: I30f497ba931de864031598d8b75d477e1b9db56a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 10:34:25 +00:00
Vincent Donnefort
03130d98e4 Merge "Add null and console dev nodes to the Android initramfs" am: 6133aea40f
Original change: https://android-review.googlesource.com/c/platform/build/+/2368008

Change-Id: I8f706fe07bc3dcbc00753f52612aae1304d2d569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 09:50:49 +00:00
Vincent Donnefort
6133aea40f Merge "Add null and console dev nodes to the Android initramfs" 2023-01-26 09:04:33 +00:00
Zhenhuang Wang
fae06b15ce Enable -sha256 feature to some Soong built zip files
Enable the new soong_zip feature to general-tests.zip,
host-unit-tests.zip, android-cts.zip, android-mts.zip etc. This is a
following change of https://r.android.com/2395452. With `-sha256` flag,
file header of generated zip files contains SHA256 checksum for each
file, which can then be used by downstream systems.

Bug: 259513199
Test: run `m dist host-unit-tests general-tests cts mts` and check zip
    files under `out/dist/`
Change-Id: I726b5261d177beadcd8f707e2cd2cb5cdef20273
2023-01-26 13:49:57 +08:00
Treehugger Robot
ec62ec5224 Merge "Fix remote execution of r8 and d8 in make" am: e9c253fe31 am: b261e8a219 am: e61231a756
Original change: https://android-review.googlesource.com/c/platform/build/+/2393217

Change-Id: Ib92be687e4e305cd6e8c7fe964e7fa24fde4f88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 02:19:49 +00:00
Treehugger Robot
e61231a756 Merge "Fix remote execution of r8 and d8 in make" am: e9c253fe31 am: b261e8a219
Original change: https://android-review.googlesource.com/c/platform/build/+/2393217

Change-Id: Ia83f323845401591990ad321c648fa2a9d58daed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-26 01:33:54 +00:00
Isaac J. Manjarres
3a7fe9184b Add support for packaging modules.load.recovery into vendor_kernel_boot
Add support for creating a modules.load.recovery file in the
vendor_kernel_boot image when
BOARD_VENDOR_KERNEL_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: I430b785c13dca84949da5032e05025385168df07
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-01-25 17:33:18 -08:00
Treehugger Robot
b261e8a219 Merge "Fix remote execution of r8 and d8 in make" am: e9c253fe31
Original change: https://android-review.googlesource.com/c/platform/build/+/2393217

Change-Id: Ib6a04b65932db48d34b3079a1b1a2e38aef585fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 23:24:49 +00:00
Treehugger Robot
e9c253fe31 Merge "Fix remote execution of r8 and d8 in make" 2023-01-25 23:13:07 +00:00
Treehugger Robot
9a192c7224 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40c3 am: e3942c7222 am: a15121baa0
Original change: https://android-review.googlesource.com/c/platform/build/+/2402512

Change-Id: I6ec476d8a88052d0843820c7fb5c737f22057a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 22:02:59 +00:00
Treehugger Robot
a15121baa0 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40c3 am: e3942c7222
Original change: https://android-review.googlesource.com/c/platform/build/+/2402512

Change-Id: I67809531682b9bb6d485a951d0c0e8f4950d332a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 21:10:44 +00:00
Treehugger Robot
e3942c7222 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2402512

Change-Id: Iba0b314bbe07804be31346a52e23d217b81b918c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 20:29:33 +00:00
Treehugger Robot
13556c40c3 Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" 2023-01-25 19:07:48 +00:00
Sam Delmerico
2d46d30fda Merge "remove unneeded dontwarn settings" am: 738531af25 am: f2cadbe1c4 am: 3bf93f2f62
Original change: https://android-review.googlesource.com/c/platform/build/+/2378047

Change-Id: Iec6ba0b49c3be86390c051b5ac8623bde161bac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 18:20:30 +00:00
Sam Delmerico
3bf93f2f62 Merge "remove unneeded dontwarn settings" am: 738531af25 am: f2cadbe1c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2378047

Change-Id: I14f8fa04dfaa1fdb6b7205a45a12cee4c65add88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 17:12:15 +00:00
Sam Delmerico
f2cadbe1c4 Merge "remove unneeded dontwarn settings" am: 738531af25
Original change: https://android-review.googlesource.com/c/platform/build/+/2378047

Change-Id: I8c168de699d75980a6de0763b1dfbf8d26490da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-25 16:29:27 +00:00
zijunzhao
deaf24812d Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make
Bug: b/261642850
Test: Build and check warnings. Add two xfail tests in art and see the
results locally.

Change-Id: I122ee2cbfa37bdb71026781efe6cb7131b873ae0
2023-01-25 04:06:34 +00:00
Dennis Shen
c320615931 Set soong config variable TrimmedApex
BUG: b/259381334
TEST: adbd banchan build with setting on and off
Change-Id: I67220735f3a6cb35a8a8676b58e433d97223e428
2023-01-24 20:04:03 +00:00
Sam Delmerico
59570d1e64 remove unneeded dontwarn settings
Some of these -dontwarn settings were added because r8 did not have access to transitive dependencies. Now these dependencies are passed as -libraryjars we can remove some of the -dontwarns.

Test: TARGET_BUILD_VARIANT=userdebug MODULE_BUILD_FROM_SOURCE=true \
  UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
  packages/modules/common/build/mainline_modules_arm64.sh -j120
Bug: 242088131
Change-Id: I408a8f3ac9d11c1bd6608f2a18fd2291db8c9275
2023-01-24 11:52:42 -05:00
Prashant Patil
7d9cda1883 AOSP: Added new properties for attestation
Added new properties, which could be set for AOSP/GSI builds.
These properties are going to be used for attestation feature through
Build.java class. Earlier in AOSP builds attestation ids were different
from provisioned ids in Keymint. These properties will be identical to
provisioned ids.

Bug: 110779648
Bug: 259376922
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest

Change-Id: I9eea5e0f2fabc667b3efedeeefdf12e7b4fc9502
2023-01-24 16:47:54 +00:00
Android Build Coastguard Worker
e273869df5 Version bump to TQ2A.230305.003 [core/build_id.mk]
Change-Id: I250dd2cde623479cef4cb773ed3e578f18136c99
2023-01-24 01:32:12 +00:00
Treehugger Robot
826414aafc Merge "Fix dependency issues for vbmeta.img target" am: 84db323873 am: 918c4d3947 am: d798353ea7
Original change: https://android-review.googlesource.com/c/platform/build/+/2399154

Change-Id: Ib44dfd6eaeaadc6053f8986fdd92204110e745f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 01:21:42 +00:00
Treehugger Robot
d798353ea7 Merge "Fix dependency issues for vbmeta.img target" am: 84db323873 am: 918c4d3947
Original change: https://android-review.googlesource.com/c/platform/build/+/2399154

Change-Id: Id10b80c2614c27984320e42c6fa359ac5a836831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 00:36:40 +00:00
Treehugger Robot
918c4d3947 Merge "Fix dependency issues for vbmeta.img target" am: 84db323873
Original change: https://android-review.googlesource.com/c/platform/build/+/2399154

Change-Id: I19ebf6d410d6aed2db2f64fdcc724a3af7b21630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-23 23:56:14 +00:00
Kelvin Zhang
0841b9076b Fix dependency issues for vbmeta.img target
Extra space in variable names causes dependencies for
INSTALLED_VBMETAIMAGE_TARGET to be missing. Remove extraneous sspaces.

Bug: 263568805
Test: lunch cuttlefish,  m distclean, m, and check
$OUT/vbmeta_vendor_dlkm.img

Change-Id: If818a8af42c407a7213f58a7142dffb9dee1fd16
2023-01-23 11:12:26 -08:00
Duy Truong
880b9e48c8 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53 am: fa4e1c1083 am: 86d92b798d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ic8be201357dfe1a8ae494c9d5e47f72e4fb8d689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 12:38:53 +00:00
Duy Truong
86d92b798d Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53 am: fa4e1c1083
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ic20cd7e386d95c207788b716ee40b96e679d282d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 11:49:56 +00:00
Duy Truong
31d9a73eef Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53 am: 028f962fd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I92ce7bc3280a907f17a992a7923acbfa172074ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 11:49:16 +00:00
Duy Truong
fa4e1c1083 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I2e3b230bd9933ce98c289711d4125884aed70161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 11:16:54 +00:00
Duy Truong
028f962fd4 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 am: fc6aa53d53
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ib11e135c591d9203868e49e31819d985074a0af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 11:15:52 +00:00
Duy Truong
fc6aa53d53 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 10:09:01 +00:00
Duy Truong
e82eda2562 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ie0baf4e2e4808b0f44225d5f4467558169127e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 09:39:06 +00:00
Duy Truong
dff3b7e210 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev
* changes:
  [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
  Include JDK with STS SDK like the other *TS suites.
2023-01-20 08:44:30 +00:00
Android Build Coastguard Worker
f966be7773 Version bump to TQ2A.230305.002 [core/build_id.mk]
Change-Id: I8ec25a672e24ed7098572fb063b9463a850e8ef3
2023-01-20 00:42:39 +00:00
Treehugger Robot
ebe27ada69 Merge "Package blkid_static in otatools" am: de15310cc0 am: 3740d039e1 am: f22af34ab2
Original change: https://android-review.googlesource.com/c/platform/build/+/2395612

Change-Id: I165e37045ae5ccfc60b720f1183073464a3e6e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 00:08:51 +00:00
Treehugger Robot
f22af34ab2 Merge "Package blkid_static in otatools" am: de15310cc0 am: 3740d039e1
Original change: https://android-review.googlesource.com/c/platform/build/+/2395612

Change-Id: Ia52786e5d3ce6aa083d895b1be4a0164e3ce3d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 23:28:18 +00:00
Treehugger Robot
3740d039e1 Merge "Package blkid_static in otatools" am: de15310cc0
Original change: https://android-review.googlesource.com/c/platform/build/+/2395612

Change-Id: I0364ba75649b2c46f08c0a8d76a34ec1419cc739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 22:56:59 +00:00
Baligh Uddin
9170e897d0 Package blkid_static in otatools
BUG: 264426585
Test: TH
Change-Id: Ie34719e98619d18dc35add80595eddd867eaf38f
2023-01-19 18:20:55 +00:00
Benjamin Peterson
099349bea8 Fix remote execution of r8 and d8 in make
1. The location of the r8.jar and d8.jar files was no longer correct.
2. $(JAVA) was not defined before rbe.mk was included.
3. $(JAVA) includes options, which much be stripped to be a rewrapper toolchain input.

Test: ran against an RBE cluster with RBE_D8_EXEC_STRATEGY=remote and RBE_R8_EXEC_STRATEGY=remote

Change-Id: Icf434f5c0fda687c70c75b01b0bfd63bcd8cc474
2023-01-19 18:17:08 +00:00
Bassem Khalife
639511b495 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 am: a60de98947 am: 7097a23780
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I6146ceae61559787362d48778ec28bc3f4fce7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 07:20:11 +00:00
Bassem Khalife
ea75ac2f92 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 am: a60de98947 am: 7097a23780
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I856ca4d58cd4da395bf2d0a9976a6a21decfaf40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 07:19:07 +00:00
Bassem Khalife
7097a23780 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 am: a60de98947
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I2597b801ac1137169580ae31364ef9d924bcf65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 06:42:36 +00:00
Bassem Khalife
a60de98947 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I118f8274d226fa39f6f36fbc85d84fca37d85869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-19 06:11:57 +00:00
Bassem Khalife
dfcbebca82 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Bug: 219813826
Change-Id: I210799217a0c686ab985f18e3b65f300c5eed438
Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b
2023-01-19 03:53:48 +00:00
Bassem Khalife
34ec5ba13e Add owners for version_defaults.mk
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
(cherry picked from commit 5dc6b582be)
Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b
2023-01-19 03:53:34 +00:00
Bassem Khalife
5565fbd76e Add owners for version_defaults.mk
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
(cherry picked from commit 5dc6b582be)
Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b
2023-01-18 23:47:14 +00:00
Presubmit Automerger Backend
6ee3acaf90 [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Bug: 238373261
Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
2023-01-18 23:02:39 +00:00
Duy Truong
3c1caa29b8 Include JDK with STS SDK like the other *TS suites.
Bug: 238373261
Test: Build and run STS SDK sample
Change-Id: I7378a555393e4194917083197829201320e595b4
2023-01-18 23:02:31 +00:00
Treehugger Robot
60c73a989d Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86 am: 621e9cc599 am: 8b33b62d4a
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: I6374a7bdd6a11396b0c497126db9681b84c31df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 21:20:54 +00:00
Treehugger Robot
8b33b62d4a Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86 am: 621e9cc599
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: I30ebb7865b2b5e10270fe435347983e424a42ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:43:42 +00:00
Treehugger Robot
621e9cc599 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: Ia3fff9e16c204c846c1600c9cdcb83dc39bac027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:24:56 +00:00
Treehugger Robot
82bac32195 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673 am: 71ca6b2e7a am: 5c89b167cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I81e862cb4c1ba70b0370bd21436de39d92c41de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:09:36 +00:00
Treehugger Robot
2797146c86 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" 2023-01-18 19:25:57 +00:00
Treehugger Robot
5c89b167cd Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673 am: 71ca6b2e7a
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I3ec5784c13351a33f7246523df9906ee3475418e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 19:08:37 +00:00
Treehugger Robot
71ca6b2e7a Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I18847369e33509c73cb58e51db3e9f018434a7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 18:36:22 +00:00
Treehugger Robot
854afb6673 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" 2023-01-18 18:07:07 +00:00
Treehugger Robot
21e0338f21 Merge "Resubmit: Initial add wvts to build" am: e473190d52 am: a7d2cc7d0a am: 6bb7a5916b
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I8f4f788447baa1f52e49bb11dceeafd3a00f51d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 02:12:21 +00:00
Treehugger Robot
6bb7a5916b Merge "Resubmit: Initial add wvts to build" am: e473190d52 am: a7d2cc7d0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: Ifa4800ff0b53a87d9d2b8b137934fc69b7763ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 01:34:34 +00:00
Treehugger Robot
a7d2cc7d0a Merge "Resubmit: Initial add wvts to build" am: e473190d52
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I794fcf36ccf04291e51030dd16f947068c97fc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 01:00:12 +00:00
Treehugger Robot
e473190d52 Merge "Resubmit: Initial add wvts to build" 2023-01-18 00:17:45 +00:00
Cole Faust
bd5eab8477 Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS
No longer used.

Bug: 262629589
Test: m nothing
Change-Id: I3d9acf9fc3e205588161c9fb50fbe757f764d6bb
2023-01-17 15:38:33 -08:00
Android Build Coastguard Worker
b0a35c98fd Make change and version bump to TQ2A.230305.001
Merge cherrypicks of ['ag/20984664'] into tm-qpr2-release.

Change-Id: I2807ebe0b2cfad46f65d587ab520b225726c40ac
2023-01-17 20:21:33 +00:00
Steve Berbary
d7834084dd Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
(cherry picked from commit 465700df39)
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-17 20:07:54 +00:00
Kelvin Zhang
1143aaf772 Fix generic ramdisk build failures on dedicated recovery partitions
For targets with BoardUsesRecoveryAsBoot set to true, binaries in
generic_ramdisk are installed to $OUT/recovery/root/first_stage_ramdisk
This path is not on generic_ramdisk.mk 's allowlist, hence build fails.
To fix the failure, add $OUT/recovery/root/first_stage_ramdisk/system to
allow list.

Test: th, lunch eos-userdebug(a dedicated recovery partition target) and build.

Bug: 265477065
Change-Id: I89cf229adc028a7e5de632b9a3188ecb411de735
2023-01-17 17:11:55 +00:00
Steve Berbary
70228fd7d9 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 am: c5f2b7f189
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Idfc5ebb5c6ee90b6fe8c81d1d183e1c17b918ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 18:55:40 +00:00
Steve Berbary
c5f2b7f189 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: I6d8deaaab9592f853e014210e16f8a09f5b673f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 18:21:20 +00:00
Steve Berbary
033863be25 Update Security String to 2023-03-01 am: 663e449fbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Ic2de423da2f3efd97d10563a288c2167b270b906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:45:06 +00:00
Steve Berbary
bcacf0d47f Update Security String to 2023-03-01 am: 4904a80247 am: 3c38b0556d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: Id6a21f0631f556a422e55732558f317974ed3e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:31:16 +00:00
Steve Berbary
c8fd0b22bc Update Security String to 2023-03-01 am: 4904a80247 am: 3c38b0556d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: I0f9cd7f657392fd60b7d3378516341f5bc64f948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:30:37 +00:00
Steve Berbary
3c38b0556d Update Security String to 2023-03-01 am: 4904a80247
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: I2461f2a4f302a397f9c3bc5497b60e6442c67c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 16:54:24 +00:00
Steve Berbary
834194d401 Update Security String to 2023-03-05 am: 465700df39 am: 39b3d42d74
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984664

Change-Id: I85276ae7f14d429d15aa46a3d51bd44f0c43a0e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 06:41:34 +00:00
Steve Berbary
39b3d42d74 Update Security String to 2023-03-05 am: 465700df39
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984664

Change-Id: Iba5261f5e598a7848d007e723e08b9299837b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 06:05:30 +00:00
Treehugger Robot
ecf2f2d30c Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33 am: b63987d351 am: 5d0d291fb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: Idd89b5377aed52cea0d775334387223f98dc2fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 03:32:59 +00:00
Treehugger Robot
5d0d291fb0 Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33 am: b63987d351
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: I4042684ef0171f8191b19a29b7695e988b31c552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 02:38:57 +00:00
Treehugger Robot
b63987d351 Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: Id38f4980039b9cefb9c0f3f5f215588ae59867b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 00:55:01 +00:00
Treehugger Robot
b80d9d6c33 Merge "Allow vendors to add custom vbmeta partitions" 2023-01-14 00:23:02 +00:00
Steve Berbary
663e449fbf Update Security String to 2023-03-01
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:22:30 +00:00
Steve Berbary
4904a80247 Update Security String to 2023-03-01
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:20:17 +00:00
Steve Berbary
465700df39 Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:18:04 +00:00
Shikha Panwar
d3bef475b2 Include initrd_bootconfig in the list of OTA tools
initrd_bootconfig is required for signing the virt apex & hence needs to
run outside the source tree as well.

Test: NA
Bug: 245277660
Change-Id: Id1776661e76a75cfb3cf530e7777dc4292522dd0
2023-01-13 08:28:44 +00:00
Xin Li
3e266be1a6 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:32:57 +00:00
Android Build Coastguard Worker
c6a1548da9 Version bump to TQ2A.230109.003 [core/build_id.mk]
Change-Id: I97a46c5295638f06ef9001d0021b6ad3287eaca7
2023-01-13 03:02:59 +00:00
Kelvin Zhang
b81b4e3621 Allow vendors to add custom vbmeta partitions
Currently we only have vbmeta_system and vbmeta_vendor. Add
BOARD_AVB_VBMETA_CUSTOM_PARTITIONS , which allows OEMs to define
their own vbmeta_*.img partitions. example: aosp/2381823

Bug: 263568805
Change-Id: Id671e2c3aee9ada90256381cce432927df03169b
2023-01-12 17:34:42 -08:00
Vincent Donnefort
4a5fd836a1 Add null and console dev nodes to the Android initramfs
/dev/null is a security requirement for bionic, /dev/console is needed
so the kernel can set-up stdout stderr and stdin before running /init.

Bug: 254835242
Change-Id: I865856885e9957ea17e28b62273e701af9bfc56f
2023-01-12 11:25:14 +00:00
Jooyung Han
efc141fb12 Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4ee8 am: 980e726aa8 am: cf119eb163
Original change: https://android-review.googlesource.com/c/platform/build/+/2379709

Change-Id: I52c64f1276960a06b69fb9e5ac59d17dac2b55c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 09:03:16 +00:00
Jooyung Han
cf119eb163 Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4ee8 am: 980e726aa8
Original change: https://android-review.googlesource.com/c/platform/build/+/2379709

Change-Id: I988ee5f7f9a69852480eeee40198b8766de15aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 08:23:59 +00:00
Xin Li
d8cc7f97ad Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Change-Id: I912db6aac23dc5ee37b8b4455eec553da31d6dbc
2023-01-11 22:54:26 -08:00
Jooyung Han
8ee63e4ee8 Merge "vendor/etc/linker.config.pb from multiple input files" 2023-01-12 06:46:39 +00:00
Android Build Coastguard Worker
686a6957d5 Version bump to TQ2A.230109.002 [core/build_id.mk]
Change-Id: Ief26fe17debe7e51ad095d1783733a55ca858015
2023-01-11 20:52:22 +00:00
Robert Shih
1b73bfbd97 Resubmit: Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +00:00
Dan Sinkiewicz
d475e99deb Merge "Revert "Initial add wvts to build"" am: e61203da9c am: 6946b25e3d am: 77e2b1d7dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972

Change-Id: I9373282ac961c40f4b13536bc8c9d9548cba1e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:58:45 +00:00
Robert Shih
9964162ae8 Merge "Initial add wvts to build" am: 0f8236bb24 am: 8d6ebee56b am: 1079601afa
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652

Change-Id: I458176f4e3bfcc4e29b2fb8b99a96029540e07e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:56:52 +00:00
Dan Sinkiewicz
77e2b1d7dd Merge "Revert "Initial add wvts to build"" am: e61203da9c am: 6946b25e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972

Change-Id: I2d7d90e3034c88872326ffe5b2a6bf73ef408459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 19:41:39 +00:00
Robert Shih
1079601afa Merge "Initial add wvts to build" am: 0f8236bb24 am: 8d6ebee56b
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652

Change-Id: I0db5fd8bdd7eb47347a5414b69023d07836b0530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 19:41:16 +00:00
Dan Sinkiewicz
e61203da9c Merge "Revert "Initial add wvts to build"" 2023-01-10 18:56:57 +00:00
Robert Shih
57fe3f6041 Revert "Initial add wvts to build"
This reverts commit 588f2e62da.

Reason for revert: b/265032293

Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
2023-01-10 18:51:18 +00:00
Robert Shih
0f8236bb24 Merge "Initial add wvts to build" 2023-01-10 18:27:26 +00:00
Jooyung Han
da2d4a29bf vendor/etc/linker.config.pb from multiple input files
When we have dedicated .mk files for each modules (e.g. usb, drm, etc)
and those modules have their own linker configuration requirements, it
would make more sense to have "fragments" for linker configuration.

This change introduces a new list variable to store the list of linker
configuration fragments. When it's set, vendor/etc/linker.config.pb is
generated from the list of input fragments.

Bug: 264330513
Test: set PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
Test: m vendorimage (generates vendor/etc/linker.config.pb)
Change-Id: I9eed0f90add0191885b7195efdab94b5b1a4a62d
2023-01-10 11:57:23 +09:00
Cole Faust
d31d1ecf0a Merge "Remove duplicates from VendorVars maps" am: 5065c690dd am: 00f730d9df am: 90274ea01d
Original change: https://android-review.googlesource.com/c/platform/build/+/2377826

Change-Id: If5f60acf36163bdd6c73e568e5d4dbcdd5b4670e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 01:39:01 +00:00
Cole Faust
90274ea01d Merge "Remove duplicates from VendorVars maps" am: 5065c690dd am: 00f730d9df
Original change: https://android-review.googlesource.com/c/platform/build/+/2377826

Change-Id: I6230ca8cf09c9814202bbe841b1192bbecf6ab90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 00:19:42 +00:00
Android Build Coastguard Worker
390c2376d4 Version bump to TQ1A.230205.002 [core/build_id.mk]
Change-Id: If255da6baf0a179cf7fde3f69b34346c64d178d6
2023-01-10 00:11:25 +00:00
Cole Faust
5065c690dd Merge "Remove duplicates from VendorVars maps" 2023-01-09 22:50:04 +00:00
Android Build Coastguard Worker
4fb411f032 Make change and version bump to TQ2A.230109.001
Snap for 9467077 from 623ac18616 to tm-qpr2-release

Change-Id: Icb582cddf02cac7b529b0b552447a286516f1ca8
2023-01-08 23:04:38 +00:00
Robert Shih
588f2e62da Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495
2023-01-08 03:38:11 +00:00
Android Build Coastguard Worker
5b59878322 Make change and version bump to TQ2A.230108.001
Snap for 9465878 from 623ac18616 to tm-qpr2-release

Change-Id: Ie5f1e2fa8df7a47d62102562b8e846bf4948ada3
2023-01-07 23:08:44 +00:00
Android Build Coastguard Worker
02d66c0e4d Make change and version bump to TQ2A.230107.001
Snap for 9463735 from 623ac18616 to tm-qpr2-release

Change-Id: Iec1e0aeced1820b0b1241e5c19d5bed240aba262
2023-01-07 02:59:43 +00:00
Cole Faust
e16def0987 Remove duplicates from VendorVars maps
Some products access the SOONG_CONFIG variables
directly, instead of using soong_config_set. When
they do that, they could end up with duplicate values
in those variables, causing duplicate keys to be
generated in a json map.

Use $(sort) to dedup the map keys before writing them
out.

Bug: 249685973
Test: Presubmits
Change-Id: If0c16377bdfbd3f836ebec9262bec7cf562f339c
2023-01-06 16:20:59 -08:00
Cole Faust
e134e2418d Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8 am: 6b95d06ae3 am: 57eafaa674
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: Ic01dbd8c6eeca8e60e7100aad70b0f16063782bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:44:54 +00:00
Cole Faust
57eafaa674 Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8 am: 6b95d06ae3
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: I1dcd90afe6b2bf8d7e432e8a46e4b13a5d5e969d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:23:18 +00:00
Cole Faust
6b95d06ae3 Merge "Fix printing variables that have inherit references in them" am: 9a92b27cd8
Original change: https://android-review.googlesource.com/c/platform/build/+/2374667

Change-Id: I35288220180404968027ac104ded3fbee2ca914e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:49:25 +00:00
Bill Yi
5c35eed416 Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:51 +00:00
Bill Yi
1c1efa3d47 Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: Ic7fbbb3a38ccd5c46cc9b9760b8f046a6501cadd
Merged-In: I4239e9cb999b688ac26ef68d77a05b2038e14fab
Change-Id: I5b623caa2cca2ee7e52f2f7954a2a1d524dac53f
2023-01-06 07:13:49 -08:00
Android Build Coastguard Worker
de7b4df735 Make change and version bump to TQ2A.230106.001
Snap for 9459725 from cecb3ca4f3 to tm-qpr2-release

Change-Id: Ibc4173a9977cc42b1264422b68fd831560d6378e
2023-01-06 01:00:28 +00:00
Cole Faust
f07dcc48e8 Fix printing variables that have inherit references in them
Inherit references (@inherit in make, 1-tuples in starlark)
usually appear in list product variables, where they're
evaluated before printing. But sometimes they can be copied
into a regular global variable, in which case they won't
be evaluated before printing. The 1-tuples were failing to
print, so adapt them to their make representation before
printing.

Fixes: 264554449
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I5ac6eb996c25ee5e77aa26ed5c4b6b6cc31819d1
2023-01-05 12:06:26 -08:00
Android Build Coastguard Worker
82ae621b36 Make change and version bump to TQ2A.230105.001
Snap for 9454839 from cecb3ca4f3 to tm-qpr2-release

Change-Id: Iec7019d6c7c876bc9fb4375f2ccdb0c820043819
2023-01-05 00:59:25 +00:00
Bill Yi
db0f5cfdaa Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I06afc5ea846a6b104eee83d9933793c868544d17
Change-Id: I78e257cbe11db35a137e01258b1d06a2b4ed9dda
2023-01-04 12:52:28 -08:00
Android Build Coastguard Worker
8c0365332a Make change and version bump to TQ2A.230104.001
Change-Id: I072ffde296a66b84bbba18b9e7361887d2e3d1c0
2023-01-04 01:00:04 +00:00
Treehugger Robot
f73b9d7afa Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e am: c3dbecdc07 am: e8070b62e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468

Change-Id: I34fbf5cc519991b497480437b119e407b5af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 19:06:42 +00:00
Treehugger Robot
e8070b62e4 Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e am: c3dbecdc07
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468

Change-Id: I3ef1d1b05a0f9d6c6ce4d42ac84d250e964e1584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03 18:10:25 +00:00
Android Build Coastguard Worker
1c1f42bb4e Make change and version bump to TQ2A.230103.001
Change-Id: Ic94536146a906c3260eabeb75737cfbb5b416a3f
2023-01-03 04:59:32 +00:00
Justin Yun
3ddd9f49e2 Revert "Define vendor-hwasan-snapshot target"
This reverts commit 97c140ccad.

As vsdk can capture hwasan snapshot with aosp/2358699, we don't need
this workaround any more.

Bug: 234772527
Test: TH
Change-Id: I94e751949d679a31060bb5fea0147947fc6682f4
2023-01-02 16:07:43 +09:00
Justin Yun
ec6e245f53 Merge "Add missing target from makefile" am: 857260905b am: 7c8ea9d79a am: a0bd05639e
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088

Change-Id: I78d660d52a94a5204428fbccceedbb17c558f9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-02 05:28:52 +00:00
Justin Yun
a0bd05639e Merge "Add missing target from makefile" am: 857260905b am: 7c8ea9d79a
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088

Change-Id: I4db49fe1d15a48fc9a4c2b96a9ac1a8d013bb50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-02 04:49:43 +00:00
Android Build Coastguard Worker
4853fb7453 Make change and version bump to TQ2A.230102.001
Change-Id: I67b27d7025d871f2bcd24ab3c7c98ccc3d4dbfee
2023-01-02 02:59:40 +00:00
Android Build Coastguard Worker
9dbc43d370 Make change and version bump to TQ2A.230101.001
Change-Id: I7d9f9a57f5bb0cbb812f9e3282bd5ed8ed1b7c83
2023-01-01 02:59:39 +00:00
Android Build Coastguard Worker
c0df5d4be6 Make change and version bump to TQ2A.221231.001
Change-Id: Idc61eab46b6ed9be8ce29ba8b1e27ac22f851466
2022-12-31 02:59:29 +00:00
Android Build Coastguard Worker
a76d7e4ffc Make change and version bump to TQ2A.221230.001
Change-Id: I49e88f995df2a5b2251dfce15665669f20165e5c
2022-12-30 01:00:24 +00:00
Spandan Das
0c851c6534 Add missing target from makefile
The target was missing in the mk file, causing "commands commence before
first target" error.

Test: TH
Change-Id: I0ec4f636daf1171e81bf9c7c764b15e07a25fc80
2022-12-29 21:00:04 +00:00
Android Build Coastguard Worker
2a8b85b932 Make change and version bump to TQ2A.221229.001
Change-Id: I22349cd4b621946c056a577167bde8ecf036b450
2022-12-29 00:59:21 +00:00
Android Build Coastguard Worker
259d52b137 Make change and version bump to TQ2A.221228.001
Change-Id: I902c98e03b0f206e60de6bc1615736db1ab6bce0
2022-12-28 00:59:39 +00:00
Android Build Coastguard Worker
fee7a2e413 Make change and version bump to TQ2A.221227.001
Change-Id: I09efac1cddcd7a09586abc9ac275497107a4a9a0
2022-12-27 01:00:10 +00:00
Android Build Coastguard Worker
eb141a8b3b Make change and version bump to TQ2A.221226.001
Change-Id: I13285b4505b29bd469dd7bb32b9705a992ad3255
2022-12-26 02:59:35 +00:00
Android Build Coastguard Worker
c941cc1611 Make change and version bump to TQ2A.221225.001
Change-Id: I68683cf0db9ed8b3c38542718d75105152184585
2022-12-25 03:00:23 +00:00
Android Build Coastguard Worker
ddc59dd087 Make change and version bump to TQ2A.221224.001
Change-Id: If4c6dcaff9bda916916cb478920a3c1de6a79cc7
2022-12-24 02:59:04 +00:00
Android Build Coastguard Worker
a13cacd59a Make change and version bump to TQ2A.221223.001
Change-Id: Ic2973d35abb319bd877b98c97319c700d6100cea
2022-12-23 00:59:41 +00:00
Zhi Dou
b9ef653b9b Merge "Add condition check of KEEP_APEX_INHERIT" am: 9bfdaf1d55 am: 4ab0444a7d
Original change: https://android-review.googlesource.com/c/platform/build/+/2365228

Change-Id: I69e21964f2530ef11404d5520c53c13e8d64cb2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 16:20:02 +00:00
Zhi Dou
9bfdaf1d55 Merge "Add condition check of KEEP_APEX_INHERIT" 2022-12-22 14:59:33 +00:00
Android Build Coastguard Worker
f36fc64f7d Make change and version bump to TQ2A.221222.001
Change-Id: Ic617cf7e5920e18cc0dc02a67a6d599a610ae7d3
2022-12-22 00:59:25 +00:00
Android Build Coastguard Worker
4c9a49741b Make change and version bump to TQ2A.221221.001
Change-Id: I68af77a21be850fb3dc5b22e67c1fddea3d335c4
2022-12-21 00:59:08 +00:00
Nick Chameyev
fa6e984572 Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" am: 839620e38c am: ed8d602609 am: 699d6097bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2364199

Change-Id: Iba0484630f3a8407254063b2726bae75b6b1bc9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:45:58 +00:00
Jooyung Han
4d128218fd Merge "checkvintf --check-one with APEXes" am: 0561be3c26 am: 6c88e7e739 am: 8af0b3d7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2361400

Change-Id: I204a974249e9f1bee0f820ba24fdb5c7a551cab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:45:00 +00:00
Zhi Dou
46ea5dc99a Add condition check of KEEP_APEX_INHERIT
Add environment variable KEEP_APEX_INHERIT condition check to set the
proper value of Soong conditional variable library_linking_strategy. If
the KEEP_APEX_INHERIT exists, the "min_sdk_version" in condition will be
set to "apex_inherit". For more detail:
https://docs.google.com/document/d/1R2vZw0cQa-haAMgFyQ682uSq9aGBNQrzMHKIsU17-XY/edit?usp=sharing&resourcekey=0-gUbs463r9LCKs7vdP_Xkmg

Test: build module locally, and check the corresponding change.
Presbumit
Bug: 254634795

Change-Id: I0ddc999a19d9f164477d69be0e4aebc91e06a3ad
Merged-In: Ic5da1c83b3b9c090bc2a24d36b1a4ac936ce1a59
2022-12-20 16:06:20 +00:00
Nick Chameyev
699d6097bc Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" am: 839620e38c am: ed8d602609
Original change: https://android-review.googlesource.com/c/platform/build/+/2364199

Change-Id: Iea60eb9d47fdfc409bdbe291aa9d2f630773bebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 16:00:12 +00:00
Jooyung Han
8af0b3d7c5 Merge "checkvintf --check-one with APEXes" am: 0561be3c26 am: 6c88e7e739
Original change: https://android-review.googlesource.com/c/platform/build/+/2361400

Change-Id: Id63770753638d1b48f78ca801d966e71571de743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20 15:59:46 +00:00
Zhi Dou
7647a31437 Merge "Add condition check of KEEP_APEX_INHERIT" 2022-12-20 15:50:12 +00:00
Nick Chameyev
839620e38c Merge "Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt" 2022-12-20 15:02:27 +00:00
Jooyung Han
0561be3c26 Merge "checkvintf --check-one with APEXes" 2022-12-20 14:44:29 +00:00
Android Build Coastguard Worker
df60f7cff9 Version bump to TQ2A.221220.002 [core/build_id.mk]
Change-Id: I4d681d793a9911898a4d6a0973a086d9c9591f3e
2022-12-20 02:10:41 +00:00
Android Build Coastguard Worker
9102fffa8e Make change and version bump to TQ2A.221220.001
Change-Id: Iafe5ed9bb0a09816ed61904f0622c7a50661ccff
2022-12-20 01:11:42 +00:00
Android Build Coastguard Worker
2c2af08b78 Version bump to TQ2A.221219.002 [core/build_id.mk]
Change-Id: Ia6c4fec09ccec52983455efcc5d69579e8bd08e9
2022-12-20 00:00:47 +00:00
TreeHugger Robot
a9a81f89d9 Merge "Add SystemUI build flag for Compose code" into tm-qpr-dev-plus-aosp am: 703c7b2789
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20785186

Change-Id: Ieecea8fa3fc83c15d7a668b472a23c9a12acb0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 19:56:26 +00:00
TreeHugger Robot
703c7b2789 Merge "Add SystemUI build flag for Compose code" into tm-qpr-dev-plus-aosp 2022-12-19 19:33:00 +00:00
Nick Chameyev
3bb4b5d759 Support SYSTEM_SERVER_JARS_EXTRA in dexpreopt
Updates hardcoded /system path to use
the qualifier before colon to support
/system_ext paths in dex_preopt.mk.

Bug: 155630745
Test: m dist droid with a system server
  library on a system_ext partition

Change-Id: I4dccc1f55bd2cafa13d57b46f122c44f66da335b
2022-12-19 16:27:04 +00:00
Jordan Demeulenaere
56f186c201 Add SystemUI build flag for Compose code (3/3)
Bug: 242304109
Test: Builds
Change-Id: Ib6e248b7af7031435a6f5398e6c8afef42459a57
Merged-In: Ib6e248b7af7031435a6f5398e6c8afef42459a57
2022-12-19 15:51:49 +00:00
Jordan Demeulenaere
4853157ef9 Add SystemUI build flag for Compose code
Bug: 242304109
Test: N/A
Change-Id: Ib6e248b7af7031435a6f5398e6c8afef42459a57
2022-12-19 16:51:15 +01:00
Jiyong Park
b0cbfb7b27 Merge "Place unstripped pvmfw image to the symbols directory" am: ad4df54d6c am: e1632f7cbf am: 54b5700954
Original change: https://android-review.googlesource.com/c/platform/build/+/2361399

Change-Id: I8d0ee82b753e6e8e14fb7475ee54972abd3d5c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 04:26:41 +00:00
Jiyong Park
54b5700954 Merge "Place unstripped pvmfw image to the symbols directory" am: ad4df54d6c am: e1632f7cbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2361399

Change-Id: Id9f99b9989b8b1db5f9966c3d7208fe04c00a8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19 03:45:08 +00:00
Jiyong Park
ad4df54d6c Merge "Place unstripped pvmfw image to the symbols directory" 2022-12-19 02:33:23 +00:00
Android Build Coastguard Worker
588753817a Make change and version bump to TQ2A.221219.001
Change-Id: Iea8ef71f749d0761ebd17548092bf30e22c403ef
2022-12-18 23:05:00 +00:00
Android Build Coastguard Worker
d6bfb89950 Make change and version bump to TQ2A.221218.001
Change-Id: Ic5e41614ad0703b08b606d9f177befe1cd4053d7
2022-12-17 23:05:55 +00:00
Android Build Coastguard Worker
e70f30b8ed Make change and version bump to TQ2A.221217.001
Change-Id: I5e972f3b45e59d93825e9dae902a5714eee54154
2022-12-17 02:59:14 +00:00
Jooyung Han
c9cc48b412 checkvintf --check-one with APEXes
checkvintf --check-one is to check the consistency of VINTF data in a
single partition. To read VINTF from /vendor partition, it should read
/apex as well to gather VINTF from vendor apexes.

Bug: 262189711
Test: m check-vintf-all
Change-Id: I70b194f4dae47ca6080dcdfb3baa69ac7da9b653
2022-12-16 16:12:29 +09:00
Jiyong Park
e219f0068a Place unstripped pvmfw image to the symbols directory
Bug: 245896220
Test: examine the symbols.zip file on aosp_cheetah
Change-Id: I8730baa64e6ff16fcdf765dc8878771d2ec16be8
2022-12-16 14:30:03 +09:00
Android Build Coastguard Worker
05337a66ee Make change and version bump to TQ2A.221216.001
Change-Id: I976f2fcf1f4254e3e08badc4879f7be70ecd334d
2022-12-16 00:59:34 +00:00
Android Build Coastguard Worker
ec2c233882 Make change and version bump to TQ2A.221215.001
Change-Id: Ifbea956edeb34c4c10c0fb7e11fc42688e15d525
2022-12-15 01:01:00 +00:00
Treehugger Robot
f5dc2a43dd Merge "Add arch variants for Intel Atom CPUs" am: d6184bc4c2 am: 8165ae0745 am: 50b6700350
Original change: https://android-review.googlesource.com/c/platform/build/+/2301583

Change-Id: I38d6846e941c4c49d2c5584072a851afe8182c6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 05:00:46 +00:00
Treehugger Robot
50b6700350 Merge "Add arch variants for Intel Atom CPUs" am: d6184bc4c2 am: 8165ae0745
Original change: https://android-review.googlesource.com/c/platform/build/+/2301583

Change-Id: I44d9c54c8a534486e9b34fd172d57ed1f4b9541f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 04:21:41 +00:00
Treehugger Robot
d6184bc4c2 Merge "Add arch variants for Intel Atom CPUs" 2022-12-14 03:32:13 +00:00
Android Build Coastguard Worker
13bcf56131 Make change and version bump to TQ1A.230205.001
Change-Id: I98d628dea8e10d7603e0478db7de2e78ce14775b
2022-12-14 02:29:47 +00:00
Steve Berbary
398ff1a8b6 Update Security String to 2023-02-05
Bug: 261738635
Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
(cherry picked from commit 79e595f4e3)
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
2022-12-14 02:23:24 +00:00
Treehugger Robot
42ce2b11cc Merge "Make clear_var_list set nonexistant variables to empty strings" am: 8998fd723e am: e2e127b270 am: 33b7fcd3ce
Original change: https://android-review.googlesource.com/c/platform/build/+/2351362

Change-Id: If1e41ec30735f5d244a6d5123a1d6da4bf96e05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 01:57:17 +00:00
Treehugger Robot
33b7fcd3ce Merge "Make clear_var_list set nonexistant variables to empty strings" am: 8998fd723e am: e2e127b270
Original change: https://android-review.googlesource.com/c/platform/build/+/2351362

Change-Id: I56835cccc5dee6ddcea19122a5b69ee112ee5510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 01:18:01 +00:00
Android Build Coastguard Worker
13ebcba144 Make change and version bump to TQ2A.221214.001
Change-Id: I5ac55be3ec06914c0612ad788ce6f06194818a05
2022-12-14 01:04:32 +00:00
Greg Kaiser
2c7472c6e1 Merge "Add rbc implementation of clear_var_list" am: 14b12d9e31 am: 44a151e2f7 am: 63964a0a93
Original change: https://android-review.googlesource.com/c/platform/build/+/2347174

Change-Id: I5428678b54954c68dadd916fa50b00d900a3f536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 22:49:39 +00:00
Greg Kaiser
63964a0a93 Merge "Add rbc implementation of clear_var_list" am: 14b12d9e31 am: 44a151e2f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2347174

Change-Id: I65067ead3251acaf3fb55a647dc5265b5817d39e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 22:07:55 +00:00
Cole Faust
44de6d8f7a Make clear_var_list set nonexistant variables to empty strings
Make's clear-var-list causes the variables to exist as empty strings.
Mimic that functionality in starlark for the variable diff and ?=.

Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I5f9c8cf342d875b1022c5c74906e59fa68fcd6c9
2022-12-13 13:02:10 -08:00
Cole Faust
8397c8efee Add rbc implementation of clear_var_list
Bug: 262303006
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ib5d7d37a7d7fa40ec990d9506fe0bef7da5b5bcd
2022-12-13 10:17:16 -08:00
Android Build Coastguard Worker
a6dfbef618 Make change and version bump to TQ2A.221213.001
Change-Id: I535d617106520845612d5fee84785ae500ade058
2022-12-13 04:43:20 +00:00
Android Build Coastguard Worker
13fb9220ee Version bump to TQ2A.221212.002 [core/build_id.mk]
Change-Id: Ifd45d47d50b203e7497ab55002b88881eb9748e3
2022-12-12 13:26:44 +00:00
Android Build Coastguard Worker
bc46a04011 Make change and version bump to TQ2A.221212.001
Change-Id: I46fbe01f1611fc1ec5e59a4837783508e18f4274
2022-12-12 02:59:39 +00:00
Android Build Coastguard Worker
8554b4a3fa Make change and version bump to TQ2A.221211.001
Change-Id: I5f655a932813731c7577a40efda049a5c46d9577
2022-12-11 02:59:36 +00:00
Android Build Coastguard Worker
722acf7011 Make change and version bump to TQ2A.221210.001
Change-Id: If69f93a5f40942cd8f51673eea8703bf998d6e57
2022-12-10 02:59:14 +00:00
Steve Berbary
e5bd30dd33 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I106595aa928c539025299d229d193869eb77fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:27:25 +00:00
Steve Berbary
4af84f8cf1 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I980866984561c3daa4d31ffa91d743ccb6abae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:11:02 +00:00
Steve Berbary
23dae41cbc Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I4fe31036b0ecebb5a6cfb8b4080e692e54e36068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 22:58:04 +00:00
Zhi Dou
fec25312ca Add condition check of KEEP_APEX_INHERIT
Add environment variable KEEP_APEX_INHERIT condition check to set the
proper value of Soong conditional variable library_linking_strategy. If
the KEEP_APEX_INHERIT exists, the "min_sdk_version" in condition will be
set to "apex_inherit". For more detail:
https://docs.google.com/document/d/1R2vZw0cQa-haAMgFyQ682uSq9aGBNQrzMHKIsU17-XY/edit?usp=sharing&resourcekey=0-gUbs463r9LCKs7vdP_Xkmg

Test: build module locally, and check the corresponding change.
Presbumit
Bug: 254634795

Change-Id: Ic5da1c83b3b9c090bc2a24d36b1a4ac936ce1a59
2022-12-09 22:17:29 +00:00
Steve Berbary
5c36c2a89d Update Security String to 2023-02-01 am: d0a709ffca am: 3b0b33502f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823

Change-Id: I51cd27f554a6a18cbeb3b7ee6b396e1ebe89d8ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 21:55:57 +00:00
Steve Berbary
5434016090 Update Security String to 2023-02-01 am: d0a709ffca am: 3b0b33502f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823

Change-Id: I8a346a9d317157133f607fe002d4b7098ef8fc8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 21:55:43 +00:00
Steve Berbary
6b05071cb3 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I7e967462a1110696405c7ebd69d2faf624b5ef7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 21:51:48 +00:00
Steve Berbary
445dfdc147 Update Security String to 2023-02-01 am: b601ce96db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I524f6521a7aa06e1cb27b5217486ab3141d2978b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 20:41:42 +00:00