Commit graph

33561 commits

Author SHA1 Message Date
Matthew Sedam
fb861d6ba6 Fix small spelling error in build/core/main.mk
Bug: N/A
Change-Id: I858fb4b23a1c85035c59c42d8e3260fd376f941c
Test: N/A
2023-05-19 20:58:16 +00:00
Kelvin Zhang
f6da3925e4 Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" am: 863cba2c1d
Original change: https://android-review.googlesource.com/c/platform/build/+/2598005

Change-Id: I0ed2a96b9ebffbed69908072ec852b0865513a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 20:51:23 +00:00
Kelvin Zhang
d8eac1cb9a 16k: Add 16K variant kernel/ramdisk build targets
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k

Change-Id: Ibb36ba4c3399b3f193795aea6597a4aa535f1bec
2023-05-19 13:08:52 -07:00
Kelvin Zhang
863cba2c1d Merge "Revert "16k: Add 16K variant kernel/ramdisk build targets"" 2023-05-19 20:05:00 +00:00
Kelvin Zhang
6572bee96b Revert "16k: Add 16K variant kernel/ramdisk build targets"
This reverts commit 1f04dfaba2.

Reason for revert: breaks build on ab/10170403

Change-Id: I92e064ab07b02e4f17a22b113032eaa4d9f131cc
2023-05-19 20:03:19 +00:00
Joe Onorato
7b578d32f9 Revert "Define release flags in starlark instead of make"
This reverts commit c113a70221.

Doesn't work with OUT_DIR hard coded outside the tree.

Test: OUT_DIR=/source/whatever m
Bug: 283278495
Change-Id: I8cc74a9ec936b9c7502b97b9b7a4fd731988c407
2023-05-19 09:22:42 -07:00
Kelvin Zhang
19020dc0ef Merge "16k: Add 16K variant kernel/ramdisk build targets" am: ab9fb56784
Original change: https://android-review.googlesource.com/c/platform/build/+/2593545

Change-Id: I4dd6845d8c3a193b23ff74d51418b910cefc9cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:41:37 +00:00
Kelvin Zhang
ab9fb56784 Merge "16k: Add 16K variant kernel/ramdisk build targets" 2023-05-19 00:00:32 +00:00
Kelvin Zhang
1f04dfaba2 16k: Add 16K variant kernel/ramdisk build targets
This adds two new build variables, BOARD_KERNEL_PATH_16K and
BOARD_KERNEL_MODULES_16K . BOARD_KERNEL_PATH_16K will be copied
to output directory as is.

BOARD_KERNEL_MODULES_16K is a list of modules which will be packed into a
ramdisk and added to output dir. This allows cuttlefish to switch to 16K
kernel at runtime without adding too much overhead, as ramdisk building
takes very little time.

Bug: 253827893
Test: m kernel_16k ramdisk_16k
Change-Id: I4e49c727e5ed07a915145897cb987f29b0fe68e2
2023-05-18 20:12:09 +00:00
Liz Kammer
bc4f48c415 Add BUILD_BROKEN_PLUGIN_VALIDATION flag
Use is to specify the list of plugins are are not allowed.

Ignore-AOSP-First: Requires an internal only change to not break when submitted
Test: CI
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f24be9dba9b53b0c1682929253a3eba9af7a4c31)
Merged-In: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
Change-Id: Ia2fe83d82ead618e480e99a82b1b825ed08d3eab
2023-05-18 18:20:22 +00:00
Treehugger Robot
f18046a759 Merge "Don't build automatic RROs for tests" am: 4d4ffb28f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2595526

Change-Id: I8498d7585e61ac82da96a2c9f7dc75758f714438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:43:14 +00:00
Treehugger Robot
4d4ffb28f4 Merge "Don't build automatic RROs for tests" 2023-05-18 06:59:24 +00:00
Treehugger Robot
b0845d7c4d Merge "Define release flags in starlark instead of make" am: cedf6314bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2585846

Change-Id: Ibef1aad9331f1dd65ec5a2ebeb27296e8b94abb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 06:16:16 +00:00
Treehugger Robot
cedf6314bc Merge "Define release flags in starlark instead of make" 2023-05-18 05:22:47 +00:00
Colin Cross
86c4177294 Merge "Build java fuzz targets with one build target instead of needed a host target and device" am: ede2d8e2ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2593446

Change-Id: I62801a11f9005090ebfd9866985a87cd6d220f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:41:19 +00:00
Colin Cross
93ff702df2 Don't build automatic RROs for tests
Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
Merged-In: I760355ffb1818e91c02a98473312f9f21c149361
2023-05-18 03:14:01 +00:00
Colin Cross
ede2d8e2ec Merge "Build java fuzz targets with one build target instead of needed a host target and device" 2023-05-18 02:51:43 +00:00
Jiakai Zhang
0f49bc7d1a Move CLC construction to Ninja phase.
Bug: 282877248
Test: m
Change-Id: Ib87aafcfad09b569e44eed3a5a6c385237a66b55
2023-05-17 21:06:32 +01:00
Wei Li
802310c4fd Merge "Some changes to support SBOM generation for b build unbundled APEXs." am: eb035dc89f
Original change: https://android-review.googlesource.com/c/platform/build/+/2585677

Change-Id: I0f302bf5cf4e6313aedc836034ccd9111f4ec534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 19:33:20 +00:00
Wei Li
eb035dc89f Merge "Some changes to support SBOM generation for b build unbundled APEXs." 2023-05-17 19:19:47 +00:00
Cory Barker
4b0112209b Build java fuzz targets with one build target instead of needed a host target and device
(cherry picked from commit 12727fceab)

Test: built locally and verified fuzzers with Jazzer
Change-Id: Icb1ecef1920fa1ba6d4492acdd3b37093964eb84
2023-05-17 19:06:26 +00:00
Anton Hansson
68af924f54 Don't add build ID to version name
There is no clear reason why this should be done, and there is evidence
of it causing confusion & minor problems.

Bug: 186432595
Test: m nothing & grep AppsDefaultVersionName out/soong/soong.variables
Change-Id: I46243b4cfb3b23f2229bc1275c6ee96c1cee01d3
2023-05-17 09:19:11 +00:00
SzuWei Lin
fb27c2954f Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 05:02:25 +00:00
Treehugger Robot
4e5532a5a1 Merge "Note ability to annotate dependencies." am: 787629c95d
Original change: https://android-review.googlesource.com/c/platform/build/+/2592248

Change-Id: I751f21b8c1ebe478ec18a053c2fb131c24f693c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:55:26 +00:00
Cole Faust
c113a70221 Define release flags in starlark instead of make
So that we have a more restricted enviornment for this new configuration
axis that can also be imported into other tools more easily.

Test: Manually
Change-Id: Iabce1919f6d6f57a256ae144784af7c47622b54d
2023-05-16 15:46:55 -07:00
Treehugger Robot
787629c95d Merge "Note ability to annotate dependencies." 2023-05-16 22:34:02 +00:00
Treehugger Robot
f739318a1a Merge "Strip values of soong_config_set calls" am: e5e5642ba5
Original change: https://android-review.googlesource.com/c/platform/build/+/2592246

Change-Id: I72bafd788fbffee43c6a09637ef8f73e20c63a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 22:32:51 +00:00
Cole Faust
76c2fcb90e Strip values of soong_config_set calls
It's a common mistake in make to have leading/trailing whitespace
on values, so strip it out before assigning to variables.

Bug: 282824346
Test: Presubmits
Change-Id: If4d3b86795c05ba32006af3af8031ca083a4c54b
2023-05-16 10:53:05 -07:00
Bob Badour
2191b9db82 Note ability to annotate dependencies.
Test: m droid dist
Change-Id: If3a0d032caf7801196117d7c4d4d21cb67c826bf
2023-05-16 10:52:12 -07:00
Joe Onorato
2c3f4f5507 Merge "Add aconfig rules" am: 7f1171e493
Original change: https://android-review.googlesource.com/c/platform/build/+/2583250

Change-Id: Ic258d2dd4320d5cfe809e1debfc991c38643d4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 03:32:45 +00:00
Joe Onorato
7f1171e493 Merge "Add aconfig rules" 2023-05-16 02:49:45 +00:00
Treehugger Robot
899fc1b715 Merge "Add merge_ota to otatools" am: 1da7ff838b
Original change: https://android-review.googlesource.com/c/platform/build/+/2587126

Change-Id: I1348aed1dbae5002122612f6bb03c97fbcad9275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:53:45 +00:00
Treehugger Robot
58c919b54a Merge "Add support for packaging modules.load.charger into vendor_[kernel_]boot" am: d28f557324
Original change: https://android-review.googlesource.com/c/platform/build/+/2559650

Change-Id: I7e6ed966518efe741d869ca30ae79237729306bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:53:16 +00:00
Treehugger Robot
1da7ff838b Merge "Add merge_ota to otatools" 2023-05-15 22:52:50 +00:00
Joe Onorato
0d1a98106a Add aconfig rules
Test: treehugger
Change-Id: I456f87894926287a91d42e738016ca8052cd5039
2023-05-15 15:38:49 -07:00
Treehugger Robot
d28f557324 Merge "Add support for packaging modules.load.charger into vendor_[kernel_]boot" 2023-05-15 22:24:11 +00:00
Treehugger Robot
0d73e67d39 Merge "Remove gpl_source.tgz" am: 48a8afe677
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I9db9146283f4775281a1c049c1f15a17f74d818d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:10:55 +00:00
Treehugger Robot
48a8afe677 Merge "Remove gpl_source.tgz" 2023-05-15 21:36:32 +00:00
Satoshi Futenma
6d56d45f96 Add merge_ota to otatools
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
2023-05-15 09:06:02 +02:00
Gregory Montoir
91721868ec Use Z_BEST_COMPRESSION for compress-package
Saves a few extra KBs with LOCAL_COMPRESSED_MODULE

Bug: 191841942
Bug: 282617419
Test: boot && apks uncompressed
Change-Id: I1a8c6cdfc194b68b2f2c9fb398851a7a4b7440bf
2023-05-15 06:25:57 +00:00
Kiyoung Kim
d1aa1cdf44 Rename soong.variable with target product
Bug: 277029044
Test: build succeeded and checked if out/soong/soong.variable has been
renamed

Change-Id: I035a52f3d8ad80d9e44a55e10fe537556ddecda8
2023-05-14 11:57:16 +00:00
Treehugger Robot
e72f71968a Merge "Only search for test suite jdk files once" am: 6961b14269
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I8102ee297fbba527a6e997bc939681ec407e0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:23:53 +00:00
Treehugger Robot
6961b14269 Merge "Only search for test suite jdk files once" 2023-05-12 05:53:11 +00:00
Joe Onorato
6a3278d350 Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

Change-Id: I15290ed9a3ceb59a4acba9a7075d457f95536e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:30:44 +00:00
Joe Onorato
48fbf97b3e Merge "Add release flag logic based on TARGET_RELEASE." 2023-05-12 01:44:46 +00:00
Cole Faust
a5f31a5820 Only search for test suite jdk files once
compatibility.mk is included 33 times on aosp, and 47 times on
internal master. Each of these would run this shell command, and
there would be an entry in the kati stamp file for each time it was
run, causing this command to be run the 33/47 times every single build.
This took ~0.2 seconds, which can be saved by only running it once.
(However these ~0.2 seconds are parallelized with other parts of the
stamp checking)

Bug: 282079550
Test: m nothing
Change-Id: I364836d1cb0cc26ca9116eda6d954170e1cb7761
2023-05-11 18:22:03 -07:00
Cole Faust
ab4f856bbc Remove gpl_source.tgz
This file was an archive of all the gpl files that could be found
in the source tree. Because it looks for gpl files using $(wildcard),
kati had to rerun the wildcards every single build to see if they had
changed. These GPL wildcards made up 30294 of 63996 wildcards present
on aosp-master. Removing these wildcards saves (aosp/internal) ~0.2/~0.1
seconds from every build, and ~0.4/~0.6 seconds from the wildcard
checking portion of kati. (The whole build sees <0.4s/0.6s of
improvement because it's parallelized with the shell checking, but
improvements here mean that we can now improve the shell commands as
well and get more fruitful results)

We don't actually use gpl_source.tgz anywhere, so we can just remove it.

Bug: 282079550
Test: m nothing
Change-Id: I77141dbb39b2d8ebd96bc258fe7dbdff5a372977
2023-05-11 18:00:38 -07:00
Treehugger Robot
f08f1ad8f9 Merge "Remove wildcards of absolute paths" am: dc5ec0bfd8
Original change: https://android-review.googlesource.com/c/platform/build/+/2584263

Change-Id: I3f0c9757d28dae10826ebd6ca8757dde0cd1bdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:56:35 +00:00
Treehugger Robot
dc5ec0bfd8 Merge "Remove wildcards of absolute paths" 2023-05-11 23:19:02 +00:00
Wei Li
fd7e6517d3 Some changes to support SBOM generation for b build unbundled APEXs.
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products

Bug: 275472038
Test: CIs
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
2023-05-11 13:58:37 -07:00
Joe Onorato
964f401281 Add release flag logic based on TARGET_RELEASE.
Test: Lots of manual testing
Change-Id: I9072f136e64576009d0debd057c8ce6918fae861
2023-05-11 12:53:36 -07:00
Cole Faust
0a9d1d6025 Merge "Allow importing starlark code in makefiles" am: 99d89154f1
Original change: https://android-review.googlesource.com/c/platform/build/+/2583544

Change-Id: If559b5f4119df6b19c42f5bf60f738ddf4365d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:14:36 +00:00
Cole Faust
99d89154f1 Merge "Allow importing starlark code in makefiles" 2023-05-11 17:04:46 +00:00
Daniel Zheng
dca6b2c4e9 Merge "Adding fastboot-info to target-files" am: 8d18a7b5fe
Original change: https://android-review.googlesource.com/c/platform/build/+/2585027

Change-Id: I2e1ddc061fb3416a19a028c7136bf10877039a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:48:18 +00:00
Daniel Zheng
a6616e1e36 Merge "Default building fastboot-info" am: 78249fb190
Original change: https://android-review.googlesource.com/c/platform/build/+/2585026

Change-Id: Idfdea112e9e4543e249b33a9d44adb67a5cc36e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:48:06 +00:00
Daniel Zheng
8d18a7b5fe Merge "Adding fastboot-info to target-files" 2023-05-11 15:42:20 +00:00
Daniel Zheng
78249fb190 Merge "Default building fastboot-info" 2023-05-11 15:19:32 +00:00
Cole Faust
8f92d4194f Remove wildcards of absolute paths
PRODUCT_DEX_PREOPT_PROFILE_DIR could be an empty string, leading to
a wildcard starting with /.

Test: m nothing
Change-Id: Ic745ed4b55cdf5d5d6b43f91c9e5f0c23635c618
2023-05-10 19:04:34 -07:00
Treehugger Robot
895afc6a7b Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing""" am: 6cc53f12b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2585565

Change-Id: I211bd75753bd04bce848248a9fe8238c2d459b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:56:56 +00:00
Treehugger Robot
6cc53f12b2 Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing""" 2023-05-10 22:11:01 +00:00
Treehugger Robot
52d9e9bb7f Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb
Original change: https://android-review.googlesource.com/c/platform/build/+/2583331

Change-Id: Ie06fa57cc87e8485806ac5fbfa882c71c9865fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 18:55:31 +00:00
Treehugger Robot
081bad48eb Merge "Also disable dexpreopt for boot images for unbundled builds." 2023-05-10 18:16:54 +00:00
Kelvin Zhang
01e67f6942 Revert "Revert "Parallelize generation of OTA package and target_file packing""
This reverts commit be63f84810.

Reason for revert: already fixed by aosp/2577072

Change-Id: I8b6c02378b1b43947575af94a6702e7d6dfd5891
2023-05-10 17:03:40 +00:00
Bruno BELANYI
2df383ef92 Merge "Revert "Parallelize generation of OTA package and target_file packing"" am: 81b5bf4831
Original change: https://android-review.googlesource.com/c/platform/build/+/2583332

Change-Id: I716035f7a8dc6403cc16a26bc5fd675706a426c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 14:41:02 +00:00
Bruno BELANYI
81b5bf4831 Merge "Revert "Parallelize generation of OTA package and target_file packing"" 2023-05-10 13:53:39 +00:00
Bruno BELANYI
be63f84810 Revert "Parallelize generation of OTA package and target_file packing"
This reverts commit e30acf1b3f.

Reason for revert: DroidMonitor-triggered revert due to breakage b/281778022

Change-Id: Ie1ffc86d1ad181d3c8800f9fd57f841d0cf3ac09
2023-05-10 13:46:40 +00:00
Jiakai Zhang
c74a4011e2 Also disable dexpreopt for boot images for unbundled builds.
This fixes the tradefed build error caused by aosp/2582191.

Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 13:54:50 +01:00
Yu Liu
5d4ffb6de8 Support sandboxing genrule
Bug: 281067655
Test: local build
Change-Id: Idb8806040f7adcb4c74304aaf17ced260472b6b0
2023-05-09 17:24:18 -07:00
Cole Faust
c63ce1ab58 Allow importing starlark code in makefiles
Adds a new `$(call run-starlark,my/starlark/file.bzl)` function that
will run the starlark file and set all the variables in the
variables_to_export_to_make dictionary as make variables.

Fixes: 280685526
Test: m nothing repeatedly causes no ninja regeneration, but touching all_versions.bzl does. go test, ./out/rbcrun -mode=rbc ./build/make/tests/run.rbc
Change-Id: Ic72e18dd28dba8233ba2dfb658b5d03ccece1bfd
2023-05-09 15:12:58 -07:00
Treehugger Robot
7b7e151175 Merge "Parallelize generation of OTA package and target_file packing" am: 06ece3c666
Original change: https://android-review.googlesource.com/c/platform/build/+/2577072

Change-Id: I889b1af8085546b6fa79f80243ec18ba47a0366b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 21:35:52 +00:00
Treehugger Robot
06ece3c666 Merge "Parallelize generation of OTA package and target_file packing" 2023-05-09 21:04:55 +00:00
Daniel Zheng
c1ffd4c7a6 Adding fastboot-info to target-files
Added so img_from_target_files can read and add fastboot-info.txt to
updatepackage

Test: m target-files-package
Bug: 194686221
Change-Id: Ia42d7174ef8a4119774057fa7c33f9a409e7ec30
2023-05-09 13:38:10 -07:00
Treehugger Robot
1e09574871 Merge "Add lunch support for TARGET_RELEASE" am: 20f0cd3f91
Original change: https://android-review.googlesource.com/c/platform/build/+/2580693

Change-Id: I10d0609f04c3a51a238643d08b386ca0dbcec17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 14:28:28 +00:00
Treehugger Robot
20f0cd3f91 Merge "Add lunch support for TARGET_RELEASE" 2023-05-09 13:51:19 +00:00
Treehugger Robot
9840061379 Merge "Remove unneeded rbcrun features" am: 872023376e
Original change: https://android-review.googlesource.com/c/platform/build/+/2580473

Change-Id: Ia8b8f735b272a8a61eb989ecef819516b3a9f2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 08:15:26 +00:00
Treehugger Robot
872023376e Merge "Remove unneeded rbcrun features" 2023-05-09 07:31:40 +00:00
Daniel Zheng
5cfa89b404 Merge "fix m fastboot_info" am: 1f09d54104
Original change: https://android-review.googlesource.com/c/platform/build/+/2579337

Change-Id: Ie17f4e859c3eb86398a45aec8147c63860d86ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 19:23:22 +00:00
Daniel Zheng
eea63fae85 Default building fastboot-info
Having fastboot-info build by default

Test: m
Bug: 194686221
Change-Id: Ic8a524c856604aaac15d52f74bacd7a5943e87c1
2023-05-08 12:11:56 -07:00
Daniel Zheng
1f09d54104 Merge "fix m fastboot_info" 2023-05-08 19:00:10 +00:00
Jeff Hamilton
a02c747449 Add lunch support for TARGET_RELEASE
This replaces support for the unused
TARGET_PLATFORM_VERSION variable.

Now, if you pass three - separated
items the first is product, the
second is release and the third
is variant. If you only pass two
they're still product-variant
and the build system will choose
a reasonable default for release.

Test: run lunch with two and three items, confirmed values in the build banner
Change-Id: I128177d96ffe81b79b6945a24ebf37861c3b25fc
2023-05-08 03:23:30 +00:00
Daniel Zheng
5236cee23c Merge "Adding Build time flag to specify Cow Version" am: d00675c764
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750

Change-Id: Ic963ae9dee979073592a88bcaf249409cbe36136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:47:32 +00:00
Daniel Zheng
d00675c764 Merge "Adding Build time flag to specify Cow Version" 2023-05-05 22:19:02 +00:00
Daniel Zheng
2b7ddbda54 fix m fastboot_info
m fastboot_info was not working. make syntax is weird

Test: m fastboot_info
Change-Id: Ifebb6e40f2c19f00436afa719259df97ce929490
2023-05-05 14:22:15 -07:00
Cole Faust
a874f88cee Remove unneeded rbcrun features
- rblf_cli and rblf_env
- -c and -f

This is in preparation for making rbcrun able to function as a more
general purpose starlark interpreter.

Bug: 280685526
Test: go test, ./out/rbc ./build/make/tests/run.rbc, ./build/bazel/ci/rbc_dashboard.py --quick aosp_arm64
Change-Id: Ifff9ce7b4369422f39c5003bb85a168c78bde7cf
2023-05-05 11:52:02 -07:00
Daniel Zheng
025099c4bc Adding Build time flag to specify Cow Version
Adding in build time flag for specifying cow version, in preparation to
add new cow version in libsnapshot

Test: m -> cat misc-info.txt
Bug: 279954153
Change-Id: I148d4e7cdd669496c91213889787172ffd83a5ab
2023-05-05 11:03:27 -07:00
Wei Li
19563ea725 Merge "Export some make variables to soong.variables." am: 19f8eb1423
Original change: https://android-review.googlesource.com/c/platform/build/+/2576745

Change-Id: I4be7d21a0ed2ea165ad0197e81eb902b33fcb7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 17:48:32 +00:00
Wei Li
19f8eb1423 Merge "Export some make variables to soong.variables." 2023-05-05 17:32:20 +00:00
Treehugger Robot
47b0388e1a Merge "Inline rbc-run script" am: 6b78461d48
Original change: https://android-review.googlesource.com/c/platform/build/+/2578551

Change-Id: Iac137a0ff27acddd25a6b4f4862bd02452cb5ec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 06:29:02 +00:00
Wei Li
996830047f Export some make variables to soong.variables.
Bug: 275472038
Test: CIs
Change-Id: I2e7a07007224364418659453d979e2bee58fe5f9
2023-05-04 22:57:54 -07:00
Cole Faust
78d0254e9e Inline rbc-run script
The board configuration already had this inlined, and the addition
of a separate script makes it harder to follow what's happening.

Bug: 280685526
Test: ./build/bazel/ci/rbc_dashboard.py --quick aosp_arm64-userdebug
Change-Id: Ib76c4a46932ae81d84f854fbee5b0453266d6497
2023-05-04 18:00:11 -07:00
Treehugger Robot
4208535571 Merge "New targets for building files needed by adb sync" am: 51e1e93a98
Original change: https://android-review.googlesource.com/c/platform/build/+/2572610

Change-Id: I956acced1438a576ac615018a0c05a2fc2b43638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:22:41 +00:00
Treehugger Robot
51e1e93a98 Merge "New targets for building files needed by adb sync" 2023-05-04 22:44:32 +00:00
Bill Yi
d98d14dc6b Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +00:00
Daniel Zheng
94c8c04669 Merge "Updating fastboot-info version" am: 047ed4abf9
Original change: https://android-review.googlesource.com/c/platform/build/+/2574772

Change-Id: Ib6305c3671ab4c02ad2120ad102386c7c9bab528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 18:35:16 +00:00
Peter Kalauskas
df6fdeef04 New targets for building files needed by adb sync
Create new phony build targets for sync_system, sync_vendor,
sync_product, sync_system_ext, sync_odm, sync_vendor_dlkm,
sync_odm_dlkm, and sync_system_dlkm.

These build just the files on the associated partion, (e.g.
/system_ext), but not the image file (e.g. system_ext.img). Like sync,
but just for a single partition.

Test: modify System UI, m sync_system_ext && adb sync && am restart
Change-Id: I5aa40d7018e029a57114681dd16db3f1e5651a63
2023-05-04 11:02:17 -07:00
Daniel Zheng
047ed4abf9 Merge "Updating fastboot-info version" 2023-05-04 17:49:07 +00:00
Bill Yi
2aa8d8eadf Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE
Merged-In: Iec0d67abed7e0d53976e663ca8f4d497a33199e8
Merged-In: Ie6c40c596af6da2c2af8368c5efa5bf907c5479a
Merged-In: I264df2b5a111cf9ce4fe8d5f9f36d2fa39de5d6f
Change-Id: Ib7a4ac5e08f6ce1683c674219996bfc65dda6fce
2023-05-03 22:34:46 +00:00
Kelvin Zhang
e30acf1b3f Parallelize generation of OTA package and target_file packing
ota_from_target_files no longer requires a zipped target file, so switch
dependency to the target_files dir. This allows build system to
parallize generation of OTA package and target file packing

Test: th
Bug: 227848550
Bug: 277028723
Change-Id: I03fb9191de3b3316ed288eaac8ae84370c2fb598
2023-05-02 20:48:14 -07:00
Treehugger Robot
e870db0c38 Merge "Generate enforce_uses_libraries.status to out/target/product" am: f9f3c569d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2556452

Change-Id: Iec0d67abed7e0d53976e663ca8f4d497a33199e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:54:49 +00:00
Treehugger Robot
f9f3c569d0 Merge "Generate enforce_uses_libraries.status to out/target/product" 2023-05-03 00:09:09 +00:00
Treehugger Robot
580e468a2b Merge "Fix whitespace in soong_config_set calls" am: a43178f9f0
Original change: https://android-review.googlesource.com/c/platform/build/+/2576350

Change-Id: I2716214f0c2e92076883001e0b47ff154b867046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:09:06 +00:00
Treehugger Robot
a43178f9f0 Merge "Fix whitespace in soong_config_set calls" 2023-05-02 22:26:06 +00:00
Cole Faust
3736374dfe Fix whitespace in soong_config_set calls
In make, soong_config_set uses an $(eval) to set it's value, expanding
the value of the soong config variable _before_ evaluating the value.
Because of this, make will strip trailing whitespace like it does on
regular assignments.

Make rbcrun match this behavior.

Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I907e85cdf50f6fac54331c0d1044f0d53bec22ed
2023-05-02 10:11:02 -07:00
Treehugger Robot
03ceb1b56e Merge "Remove config for 64-bit binder ABI" am: 8844e4f145
Original change: https://android-review.googlesource.com/c/platform/build/+/2553826

Change-Id: If2ef5b329f9e246b50c1a2188a45f87677646e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 22:16:16 +00:00
Treehugger Robot
8844e4f145 Merge "Remove config for 64-bit binder ABI" 2023-05-01 21:32:30 +00:00
Kalesh Singh
97b11a5794 Merge "16k: Add ro.product.cpu.pagesize.max property" am: a5530711fb
Original change: https://android-review.googlesource.com/c/platform/build/+/2545851

Change-Id: Ib3bc4aed0cd88d80b3d1406e026b59ce8bf2c723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 18:44:57 +00:00
Kalesh Singh
a5530711fb Merge "16k: Add ro.product.cpu.pagesize.max property" 2023-05-01 18:08:11 +00:00
Daniel Zheng
e05a15bfed Updating fastboot-info version
Updating version to single number

Test: m fastboot_info
Change-Id: If4754f1cedd9cc1f57ffdfbb73e7e4cc7ced4799
2023-05-01 11:07:33 -07:00
Treehugger Robot
ec7016d160 Merge "Enable HWASan for multiple modules in one place(Make)" am: 6d406f854e
Original change: https://android-review.googlesource.com/c/platform/build/+/2495518

Change-Id: I229d3bba8e595af529679fb8c9efbaa51e053353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:48:48 +00:00
Treehugger Robot
6d406f854e Merge "Enable HWASan for multiple modules in one place(Make)" 2023-04-29 00:10:16 +00:00
Daniel Zheng
178e375270 Merge "Added build target for fastboot-info.txt" am: cda8aac196
Original change: https://android-review.googlesource.com/c/platform/build/+/2480147

Change-Id: I0a20c4bf9ba160e8c356b1c949af0e285afcba35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 19:52:50 +00:00
Daniel Zheng
cda8aac196 Merge "Added build target for fastboot-info.txt" 2023-04-28 19:05:29 +00:00
Kalesh Singh
93d347a057 Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" am: 48033761bf
Original change: https://android-review.googlesource.com/c/platform/build/+/2529029

Change-Id: I10813b93f1906931c87b6e30e8b73610cb3464e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 18:29:51 +00:00
Kalesh Singh
48033761bf Merge "16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag" 2023-04-28 18:19:13 +00:00
Treehugger Robot
23682da30f Merge "Enforce product interface by default" am: cf97263876
Original change: https://android-review.googlesource.com/c/platform/build/+/2499395

Change-Id: I950bd24c4932d3abfc4951e2c843df23c7c07656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 06:55:41 +00:00
Treehugger Robot
cf97263876 Merge "Enforce product interface by default" 2023-04-28 05:56:40 +00:00
Juan Yescas
e5c0c174d5 16k: Define PRODUCT_MAX_PAGE_SIZE_SUPPORTED flag
The PRODUCT_MAX_PAGE_SIZE_SUPPORTED will be used to define the
ELF segment alignment of the binaries (executables and shared
libraries). The alignment is set based on these conditions:

- If PRODUCT_MAX_PAGE_SIZE_SUPPORTED is defined, that value will be
used to align the binaries. If not defined, see condition below:
- If it is a low memory device, 4096 will be the alignment. If it is
not low memory device, see conditon below:
- If VSR vendor API level < 34, 4096 will be the alignment, otherwise
it will be 65536.

Test: Built for in Pixel 4a, 6 and verified the alignment with readelf.
Bug: 276963698
Bug: 276801883
Change-Id: I53a8902ab62e6d378aec84c28bc627f0e8a98500
2023-04-28 02:42:00 +00:00
Peiyong Lin
8c97799f15 Merge "Properly define angle.mk" am: c4c3462f2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2563813

Change-Id: Ie14484a2aaa545670e9e895aaf7d8c2b4d1daa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 20:26:15 +00:00
David Anderson
816da938da Added build target for fastboot-info.txt
Bug: 194686221
Test: mm fastboot_info, fastboot flashall
Change-Id: I9db35f48f795f5ff73db7c7e7d3d1264aa660e80
2023-04-27 11:04:33 -07:00
Jeongik Cha
45c0c2c9ac Introduce dist-for-goals-with-filenametag
this function append FILE_NAME_TAG_PLACEHOLDER at the end of file name,
and call dist-for-goals

Bug: 278060169
Test: m dist
Change-Id: I35a48ad722cc266cadb4ed0910820589927fcef1
2023-04-27 16:10:05 +09:00
Peiyong Lin
148276b55a Properly define angle.mk
Previously we used USE_ANGLE to determine whether the build should include
ANGLE drivers, this patch consolidates that into a separate Makefile.

Bug: b/270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I4d7ffb869ced219009446d907230178e4b940157
2023-04-26 22:05:20 +00:00
Yuxin Hu
a039a3c302 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" am: e872adfc97
Original change: https://android-review.googlesource.com/c/platform/build/+/2560175

Change-Id: I1e7925c2d5aa4e4891df0f7991dedb0ff11f89aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 20:45:35 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
2023-04-26 20:45:15 +00:00
Yuxin Hu
e872adfc97 Merge "Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor" 2023-04-26 20:03:58 +00:00
Steven Moreland
8eca4f898e Merge "remove 32-bit binder req" am: b6040d38fe
Original change: https://android-review.googlesource.com/c/platform/build/+/2565810

Change-Id: I1e2f58d013b3b18de045dbaf122b09a2f3b46c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 17:48:07 +00:00
Steven Moreland
b6040d38fe Merge "remove 32-bit binder req" 2023-04-26 17:00:01 +00:00
Steven Moreland
03a11ff1c3 remove 32-bit binder req
Now that this value is no longer being read by
libbinder, I'm doing the following to remove
it from the build:
1. this CL (remove requirement)
2. removing the config from all devices
3. removing config from the build + kati obsolete

Bug: 232423610
Test: build, boot
Change-Id: I77fcd14c273b43bd10430a55e91e1d5accc9efd0
2023-04-26 16:48:52 +00:00
Julien Desprez
f268c6ddd1 Merge "Remove jars from suites that aren't used" am: 283e59bf2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330

Change-Id: Ibb2cdbef8dfb72a22aec8f3efeabe0564c905cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:04:34 +00:00
Julien Desprez
283e59bf2d Merge "Remove jars from suites that aren't used" 2023-04-26 15:19:35 +00:00
Justin Yun
762614fd4a Generate enforce_uses_libraries.status to out/target/product
enforce_uses_libraries.status files require dexpreopt.config files
which are generated in out/target/product/<product>/obj because they
are specific to target products.
As common files cannot depend on product specific files, generate the
enforce_uses_libraries.status files to the product specific
intermediate directories instead of the common intermediates.

Bug: 279360253
Test: build
Change-Id: Idc468fdaf046cd37dd8f39a9212aad78283b4c61
2023-04-26 19:39:39 +09:00
Treehugger Robot
c5200cc442 Merge "Create new target-files-dir target" am: 428f5d5961
Original change: https://android-review.googlesource.com/c/platform/build/+/2552714

Change-Id: Ie1bd32f66456ecbd276627d326fc970c4c97740c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 04:10:15 +00:00
Treehugger Robot
428f5d5961 Merge "Create new target-files-dir target" 2023-04-26 03:35:01 +00:00
Julien Desprez
ebe62658ed Remove jars from suites that aren't used
Test: presubmit
Bug: 279638202
Change-Id: I01ea97bee5c9502eebda7e09eb617854e1aaf1a8
2023-04-26 01:29:13 +00:00
Julien Desprez
aea93408dc Merge "Remove tradefed-no-fwk from suites" 2023-04-26 01:28:22 +00:00
Colin Cross
e9f67b7fcc Merge "Update PLATFORM_VERSION to VP1A" am: 0697b9bb6e
Original change: https://android-review.googlesource.com/c/platform/build/+/2556030

Change-Id: Ia80957a81eeaea579a35ebf54c8b8ed5f374e9c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 00:45:59 +00:00
Colin Cross
0697b9bb6e Merge "Update PLATFORM_VERSION to VP1A" 2023-04-26 00:23:54 +00:00
Julien Desprez
5fc7314a51 Remove tradefed-no-fwk from suites
Test: presubmit
Bug: 262597958
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:917acd67c736894551537c52f8eebc4ab8f96b95)
Merged-In: I672533c475362f4438b5aefc108749be4cfc97df
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
2023-04-25 20:55:31 +00:00
Yuxin Hu
dbd7c0472d Use ro.gfx.angle.supported to indicate if ANGLE is built in vendor
Bug: b/270994705
Test: m -j45; flash and check Pixel 7 boots fine
atest CtsAngleIntegrationHostTestCases

Change-Id: I0fb881962ab77abd18f05d33393c4ee11694109c
2023-04-25 18:05:45 +00:00
Justin Yun
308d02fd62 Enforce product interface by default
We have both with/without product interface enforced targets.
Because of this, unbundled apps in the product partition must consider
bundled cases and has to add `jni_uses_platform_apis: true` to use jni
libraries.
As targets with PRODUCT_SHIPPING_API_LEVEL > 29 must enforce the
product interfaces, if PRODUCT_SHIPPING_API_LEVEL is not defined,
enforce the product stable interface by default.

Bug: 273386586
Test: TH
Change-Id: I5874bf0ae8477fab7b1097ad24c9cc0d95543eb1
2023-04-25 08:14:58 +00:00
Isaac J. Manjarres
64fa9a35bd Add support for packaging modules.load.charger into vendor_[kernel_]boot
Add support for createing a modules.load.charger file in the vendor_boot
and vendor_kernel_boot images when
BOARD_VENDOR[_KERNEL_]_RAMDISK_CHARGER_MODULES_LOAD is specified.

Bug: 266752750
Change-Id: Ic8fc06566aafa5c01dff50daa6293c6cb6d0c263
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
2023-04-24 16:01:59 -07:00
Joe Onorato
5f647df78d Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" am: 735320a9d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2556850

Change-Id: Ie384802be1ad23f293901c1fc4e766eb448785ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 21:31:52 +00:00
Colin Cross
d69b64d33f Update PLATFORM_VERSION to VP1A
Update PLATFORM_VERSION to VP1A.  The codename is now VanillaIceCream.

Bug: 279492191
Test: m checkbuild
Change-Id: Ibc24c10cf040407d79662c1819beaf97da791efb
Merged-In: Ibc24c10cf040407d79662c1819beaf97da791efb
2023-04-24 14:28:13 -07:00
Joe Onorato
735320a9d7 Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" 2023-04-24 21:06:57 +00:00
Treehugger Robot
28ecb7a712 Merge "rearrange app-related artifact path in make" am: 73d29f11b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2554553

Change-Id: I5f68611bc2ee8d0f3dfeb4a4faec03596c6695b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:50:30 +00:00
Treehugger Robot
73d29f11b8 Merge "rearrange app-related artifact path in make" 2023-04-24 18:24:36 +00:00
Jeongik Cha
ba1b925e47 rearrange app-related artifact path in make
* move package-res.apk related files to "common" intermediate dir as
  aapt2.srcjar does because it is an app which is supposed to be arch
  neutral
* add device name in auto-gen RRO to avoid conflicits

Bug: 279358050
Bug: 279360102
Test: m
Change-Id: Ibcc5e5546bd43767ab0d4807933eeb57d58f99d6
2023-04-24 13:16:32 +00:00
Joe Onorato
9ba2f4d022 Save approx 18GB of RAM by not having a bazillion copies of the same modules names
Bug: 278864904
Test: treehugger, m, manual inspection
Change-Id: Ib564b3edf4a0523fc8231b8e57a5ba9c42a73294
2023-04-24 01:11:40 -07:00
Cole Faust
b3e7b06662 Merge "Create art_debug_opt_flag soong config variable" am: 7740915dbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2549370

Change-Id: Ieedff309d9384c0a69a73833aa8ed042213bb54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-22 02:03:24 +00:00
Cole Faust
7740915dbf Merge "Create art_debug_opt_flag soong config variable" 2023-04-22 01:18:06 +00:00
Kalesh Singh
72222fbec9 16k: Add ro.product.cpu.pagesize.max property
The device's max supported page size is determined by the
build variable TARGET_MAX_PAGE_SIZE_SUPPORTED.

Export this variable as system property for use in tests.

Bug: 277360995
Test: atest -c vendor_elf_alignment_test -s <serial>
Change-Id: I4f33a42de359c8119e55056f9fd9c7147c7058ec
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2023-04-21 21:04:10 +00:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
2023-04-21 09:49:08 -07:00
Vinh Tran
e222b9d6e4 Merge changes from topic "AFDO_PROFILES"
* changes:
  Split PRODUCT_AFDO_PROFILES into two variables
  Optionally include afdo_profiles.mk if available
2023-04-21 15:06:28 +00:00
Treehugger Robot
e16241ce4f Merge "Remove lunch target from appcompat log" 2023-04-21 05:46:47 +00:00
Kelvin Zhang
2c561d8cb1 Create new target-files-dir target
Create a new phony target target-files-dir, which points to
$(BUILT_TARGET_FILES_DIR) . All dependencies of
BUILT_TARGET_FILES_PACKAGE are now a dependency of
BUILT_TARGET_FILES_DIR. The purpose of BUILT_TARGET_FILES_DIR is to
represent an unzipped version of the target_files.zip . Some tools, such
as ota_from_target_files, can work directly with unzipped target_files.
This change allows such tools to avoid having to zip the target_files
by depending on BUILT_TARGET_FILES_DIR instead of
BUILT_TARGET_FILES_PACKAGE.

This CL does not have any functional changes, targets such as otapackage
and updatepackage still depend on the zipped target_files.

Bug: 227848550
Bug: 277028723

Test: m installclean && m updatepackage
Change-Id: I83e69370ae5efa9046710f5909276077796f6b30
2023-04-20 21:08:06 -07:00
Vinh Tran
424539f6c1 Split PRODUCT_AFDO_PROFILES into two variables
Currently, PRODUCT_AFDO_PROFILES is generally applied to all products and is not semantically treated as a product config varilable.

Splitting this allows us:
1. Explicitly tell that PRODUCT_AFDO_PROFILES takes precedence over product-agnostic profiles in AFDO_PROFILES
2. Add PRODUCT_AFDO_PROFILES to _product_vars_list

Test: Define PRODUCT_AFDO_PROFILES in a product config and make sure it appears first in the soong var AfdoProfiles
Bug: 277215393
Change-Id: I284f6308d456994bb72129cb0d7be7cd091993ae
Merged-In: I284f6308d456994bb72129cb0d7be7cd091993ae
2023-04-20 17:37:53 -04:00
Vinh Tran
9281bc8c8f Optionally include afdo_profiles.mk if available
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
Merged-In: I2cc51412de141c4e6ad69f49cef378121e0b3b87
2023-04-20 17:33:00 -04:00
Kelvin Zhang
ca812338a2 Add create_brick_ota to otatools.zip
This allows create_brick_ota binary to be used by downloading
otatools.zip from ab, instead of having to build it locally.

Bug: 278925744
Change-Id: I704355b74bc2de7e8d5b881deb01efbee0fdda2a
2023-04-19 19:15:07 -07:00
Hang Lu
e235ded733 Enable HWASan for multiple modules in one place(Make)
Environment variables HWASAN_INCLUDE_PATHS and
PRODUCT_HWASAN_INCLUDE_PATHS can be used to enable HWASan for multiple
modules, by just adding the module directory to the env variable.

Bug: b/271948407
Test: Set specific module directory to above env variable and check the
assembly codes of output elf files after building, finding hwasan
related symbols inside.

Change-Id: I4493cb627fb564ee317eb95bd24ec020d42ae28c
2023-04-19 22:59:46 +00:00
Cole Faust
05bc3db3cd Create art_debug_opt_flag soong config variable
For use in art_debug_defaults.

Bug: 247785938
Test: See other cl in topic
Change-Id: I3d272b893ba05d65f21fdf65bf4f06dc172adfd8
2023-04-19 13:44:55 -07:00
Wei Li
0ab788ee83 Merge "Copy SBOM files of unbundled APKs to dist directory." 2023-04-19 16:36:36 +00:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory.
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
2023-04-18 15:57:34 -07:00
Colin Cross
bc18b00770 Move old installed file cleanup logic below build/make/core/Makefile
build/make/core/Makefile modifies ALL_DEFAULT_INSTALLED_MODULES,
move the cleanup logic below where it is included so that any
additions are covered by the cleanup logic.

Bug: 267014648
Test: manual
Change-Id: If3ab59aa19273fb20f171a3bb74ea1a2c3841585
2023-04-18 11:32:24 -07:00
Inseob Kim
168ab6af74 Remove lunch target from appcompat log
This is to reduce build rule divergence among targets. We only need the
path under PRODUCT_OUT.

Bug: 277662244
Test: build and boot
Change-Id: Ica8776d1779c47305c3c74015be2b3597cbdf95c
2023-04-18 14:02:52 +09:00
Florian Mayer
ed97847d9a Merge "Include hwasan lib and runtime on arm64 system images" 2023-04-14 23:27:56 +00:00
Florian Mayer
201eb3b6cc Include hwasan lib and runtime on arm64 system images
This is needed so we can run hwasan-enabled apps for debugging on normal
system images.

Bug: 276930343
Change-Id: Ie572d77307e5e6268b851ea5c96aae05d588dae3
2023-04-13 17:39:25 -07:00
Treehugger Robot
859d43a1bd Merge "Make sort as part of the inner command" 2023-04-13 17:55:03 +00:00
Wei Li
c4d0a61ee3 Copy SBOM files to directory dist/sbom instead of dist/.
There will be more SBOM files for unbundled APEXs/APks, so collect all in sbom/ for scilo ingestion later.

Bug: 266726655
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m dist
Change-Id: Iff4f1177df425095cef3c95c7bf4b85c62fa2e8d
2023-04-13 02:12:32 +00:00
Treehugger Robot
09ead5b787 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:26 +00:00
Wei Li
82bf15a96d Merge "Revert "Revert "Copy SBOM to dist directory when running "m dist".""" am: 2e8993e882 am: e7937f2c3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2525828

Change-Id: I4628607b633cc2d485bdb6ac29c8396ed2dbf603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 07:00:47 +00:00
Wei Li
ff8e18cf3e Revert "Revert "Copy SBOM to dist directory when running "m dist".""
This reverts commit fd358ae340.

Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.

Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
2023-04-11 23:43:54 +00:00
Xin Li
c350dd238e Merge TQ2A.230405.003
Bug: 271343657
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Change-Id: I2d6e182e3ac754c66bd6814abe96789a4bdcb701
2023-04-11 00:00:10 -07:00
Steve Berbary
83110082f8 [automerge] Update Security String to 2023-06-05 2p: 908e3504d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22561221

Bug: 277078610
Change-Id: I5046a63eda6de8307fbc94d86746c2906d444688
2023-04-11 01:55:59 +00:00
Steve Berbary
908e3504d8 Update Security String to 2023-06-05
Bug: 277078610
Change-Id: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
2023-04-11 01:54:58 +00:00
Jooyung Han
ac1368846a Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 am: ac31a9eee0
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: I45f62954cf5cc3a858d2915815dc1f0a91dadbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 09:02:48 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00:00
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
2023-04-10 04:02:06 +00:00
Treehugger Robot
b01b05bf69 Merge "Remove device.mk" am: 3665d8dfa8 am: 85d032fb46
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: Ica5ebc5e3f8112d5eeb7d33690f6a10d93bdff96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 04:37:42 +00:00
Cole Faust
5752005ee4 Remove device.mk
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
2023-04-07 16:03:58 -07:00
Treehugger Robot
fbf81f8b10 Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 am: d7de9d7a9d
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: Ifd196ee3ed21cf117a94ece9c9c80c1cf04793f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 03:57:15 +00:00
Treehugger Robot
4ae1b2e2b1 Merge "Add partition compatibility symlinks to installed file list." 2023-04-07 02:45:45 +00:00
Inseob Kim
e7d0b7a394 Merge "Remove 28.0 compat support" am: 3875d6c82f am: c32b330031
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I52d6ede32f3716bae22e2798ad29ce25a7702f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 02:00:23 +00:00
Inseob Kim
3875d6c82f Merge "Remove 28.0 compat support" 2023-04-07 00:52:30 +00:00
Treehugger Robot
a0a725c18e Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 am: 166753a939
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: I21ef090d4b06ad872bf67b88605ee33023269a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 21:40:59 +00:00
Treehugger Robot
40472c2371 Merge "Adapt to rearranged NDK sysroot." 2023-04-06 20:46:41 +00:00
TreeHugger Robot
6f523ecca3 Merge "Optionally include afdo_profiles.mk if available" into tm-qpr-dev-plus-aosp 2023-04-06 17:12:33 +00:00
Vinh Tran
dc158cff8b Optionally include afdo_profiles.mk if available
Previously, the product var is defined in pixel product config only. This breaks SDK finalization for udc (google3/configs/wireless/android/busytown/platform/git_udc/git_udc-release.gcl). In SDK finalization, we need to ensure performance/usage of libraries are consistent across all builds that don't set SKIP_ABI_CHECKS.

This CL optionally includes the afdo_profiles if available so that afdo is on all products by default.

Ignore-AOSP-First: The topic has internal-only CLs
Test: CI
Bug: 276672785
Change-Id: I2cc51412de141c4e6ad69f49cef378121e0b3b87
2023-04-06 00:44:03 -04:00
Treehugger Robot
407d194de4 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 am: 7171df5985
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ic7d66f960673a8985c2535016f2da5ca07cb6b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 22:21:20 +00:00
Android Build Coastguard Worker
0f559666ab Version bump to TQ2A.230505.002 [core/build_id.mk]
Change-Id: Iaa614601992916e12fdfd73eea9a472702389849
2023-04-05 21:49:42 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list.
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
2023-04-05 11:06:40 -07:00
Wei Li
5bb735bd95 Quote the value of product mfr in case it contains space.
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
2023-04-05 10:24:12 -07:00
Juho Kim
0c351860cd Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 am: 3d396b837e
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I075cfe61e2412cc0965a5b2b87b8f5f0eeaf77d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 09:01:45 +00:00
Wei Li
225a986e87 Merge "Copy SBOM to dist directory when running "m dist"." am: 84cd6a78ea am: 374d334dfc
Original change: https://android-review.googlesource.com/c/platform/build/+/2494875

Change-Id: I73ec02bf070378ed9994e88cb6f016e9de32bb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 07:13:27 +00:00
Juho Kim
fd358ae340 Revert "Copy SBOM to dist directory when running "m dist"."
This reverts commit bc7868b18e.

Reason for revert: DroidMonitor: Potential culprit for Bug 277015970 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: If7d2d070714d5b58e77488d4e26d4003bfc34f79
2023-04-05 07:10:21 +00:00
Dan Albert
1d7f51da6f Adapt to rearranged NDK sysroot.
Soong didn't have any explicit references to these paths because it
depends directly on the modules, but the make side of the build still
needs to construct these paths explicitly.

I removed a bunch of dead code that made the fix less obvious while I
was here.

Bug: None
Test: treehugger
Change-Id: I1a283a3bc98a94fc5481c869b3b0a4eacf69d859
2023-04-04 21:28:51 +00:00
Wei Li
a086cd0154 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." am: 32789cd805 am: f1dd146c2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2512055

Change-Id: Iddbe801a50cce12969bb4d753c1e613493f1ca26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 01:55:25 +00:00
Wei Li
bc7868b18e Copy SBOM to dist directory when running "m dist".
Bug: 266726655
Test: Run "m dist" and sbom.spdx.json should be in dist directory.
Test: CIs
Change-Id: Iabd3b980863fcb62dd75b6f778c49447073b9cdf
2023-04-04 00:56:52 +00:00
Wei Li
32789cd805 Merge "Filter out installed files of partitions not built for a target product in SBOM generation." 2023-04-04 00:55:38 +00:00
Treehugger Robot
c06f8bbf19 Merge "Set PRODUCT_AFDO_PROFILES to AfdoProfiles product var" 2023-04-03 22:35:25 +00:00
Wei Li
ec0881e0c3 Filter out installed files of partitions not built for a target product in SBOM generation.
Also collect some information of all prebuilt partition images for later use in SBOM generation.

Bug: 272360068
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: I82cd93a50e4230123d47feab9a558211c4276425
2023-04-03 20:01:34 +00:00
Ulya Trofimovich
33267272ab Merge "Revert "Disable dexpreopt for aosp_riscv64"" am: 1d3c4ae036 am: 86b1dd2b00
Original change: https://android-review.googlesource.com/c/platform/build/+/2511036

Change-Id: I76ac0b1cd690b2a019ab0b23bf3b2f01eb6a7fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 12:37:37 +00:00