Commit Graph

33126 Commits

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