Commit graph

33013 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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