Commit Graph

34149 Commits

Author SHA1 Message Date
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
f318e46c60 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev 2023-01-20 08:44:30 +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