Commit Graph

99868 Commits

Author SHA1 Message Date
Treehugger Robot
7ed5b4ed3a Merge "target-files: Support erofs_compress_hints" into main am: f55902f65f
Original change: https://android-review.googlesource.com/c/platform/build/+/3213595

Change-Id: I1df617ad0cdbafaa75613c473691287e2e3edf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 01:43:54 +00:00
Treehugger Robot
f55902f65f Merge "target-files: Support erofs_compress_hints" into main 2024-08-13 01:21:02 +00:00
Luca Farsi
4603e032fa Merge "Change artifact matching to be more strict" into main am: eb086f0d42
Original change: https://android-review.googlesource.com/c/platform/build/+/3209313

Change-Id: I73165d779991442fcd0bc996a4cbaae6b0b59ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 18:08:59 +00:00
Luca Farsi
eb086f0d42 Merge "Change artifact matching to be more strict" into main 2024-08-12 17:50:33 +00:00
Luca Farsi
99d40d7554 Change artifact matching to be more strict
The current artifact matching logic will cause any test target that uses
something like .*-tests.zip to be way too broad in what it causes to
build. Change the logic to look for the target name in the artifact
matching regex to make it so that only tests that look for a specific
target to match.

Test: atest build_test_suites_test
Bug: 348489774
Change-Id: Ia75e38b676607f45f2b1c8fcf948045c248f1729
2024-08-12 09:59:11 -07:00
Jooyung Han
52b7214fd3 Merge "Remove setting init.userspace_reboot.is_supported" into main am: 832819e90d
Original change: https://android-review.googlesource.com/c/platform/build/+/3213601

Change-Id: Id3c34f742ea3938ca81b70f664fabdd3eb2f193b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 00:42:57 +00:00
Jooyung Han
832819e90d Merge "Remove setting init.userspace_reboot.is_supported" into main 2024-08-12 00:41:20 +00:00
Treehugger Robot
2a092d2b01 Merge "Build product/odm build.prop with Soong" into main am: 57ac3a18ea
Original change: https://android-review.googlesource.com/c/platform/build/+/3213597

Change-Id: Id80b6d3f789b45f8d2e2bff6c4bd51d8e032eadf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-12 00:36:42 +00:00
Treehugger Robot
57ac3a18ea Merge "Build product/odm build.prop with Soong" into main 2024-08-12 00:08:32 +00:00
Android Build Coastguard Worker
9e8a38292b Version bump to AP3A.240905.015 [core/build_id.mk]
Change-Id: I39a828922f156397cdfd084361598c7f31114183
2024-08-09 20:55:02 +00:00
Yike Zhang
a6fc08335c Merge "Link shared libs to x86/x86_64 folder if available" into main am: 651fa75112
Original change: https://android-review.googlesource.com/c/platform/build/+/3212234

Change-Id: I66a36b77b86d457c6a330b503fc20c4950570f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 17:36:19 +00:00
Yike Zhang
651fa75112 Merge "Link shared libs to x86/x86_64 folder if available" into main 2024-08-09 17:02:25 +00:00
Jooyung Han
a2f9851521 Remove setting init.userspace_reboot.is_supported
Userspace reboot is deprecated.

Bug: 292469129
Test: build cuttlefish.
Test: adb shell getprop init.userspace_reboot.is_supported
Change-Id: I51ded79d3ae3df5363e6a7c9d1c5dcd06163f78e
2024-08-09 14:40:58 +09:00
yike
261e22dd1d Link shared libs to x86/x86_64 folder if available
Currently, the shared libs are not categorized according to arch,
which adds more redundant dependencies at runtime and might mislead
the test execution.

Test: m host-unit-tests
Bug: 351909435
Change-Id: I48f8e6752879cdd4d510ce5b611dc6c118a42f8f
2024-08-09 03:34:08 +00:00
Treehugger Robot
7f937c4bd2 Merge "Export related make variables for gralloc.default to soong" into main am: b3984cac84
Original change: https://android-review.googlesource.com/c/platform/build/+/3211281

Change-Id: I2488d9021d4917065f14405e70bb98a141824b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-09 03:05:25 +00:00
Treehugger Robot
b3984cac84 Merge "Export related make variables for gralloc.default to soong" into main 2024-08-09 02:44:45 +00:00
Android Build Coastguard Worker
f3c1eacd49 [coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L32900030005709642 into 24Q3-release.
COASTGUARD_SKIP: I926dbb03a144eb424e0177ff6b27b31700dbdf5b

Change-Id: Ic0bd375ca790ab0d8e5a66292a644e9376443764
2024-08-09 01:54:40 +00:00
Android Build Coastguard Worker
1ab90756d7 Version bump to AP3A.240905.014.Y1 [core/build_id.mk]
Change-Id: I926dbb03a144eb424e0177ff6b27b31700dbdf5b
2024-08-09 01:53:27 +00:00
Luca Farsi
5360394e6c Merge "Refactor OptimizedBuildTarget and add general-tests optimization" into main am: 944fa4f813
Original change: https://android-review.googlesource.com/c/platform/build/+/3212227

Change-Id: Icd32e895d7d29ea8a574f154501a83f7eaeaa038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-08 23:41:26 +00:00
Jooyung Han
67911682c2 target-files: Support erofs_compress_hints
erofs_compress_hints files should be copied into target-files and then
sign_target_files_apks should use them from the target-files.

Bug: 357721652
Test: m target-files-package (with aosp/3204257)
Test: sign_target_files_apks <target_file> signed-target-files.zip
Change-Id: Id55000004ecb72ea8fec19bfbe144c9b4d3f06cb
2024-08-09 08:27:19 +09:00
Luca Farsi
944fa4f813 Merge "Refactor OptimizedBuildTarget and add general-tests optimization" into main 2024-08-08 23:16:53 +00:00
Luca Farsi
70a53bd6cf Refactor OptimizedBuildTarget and add general-tests optimization
Refactor the OptimizedBuildTarget base class to more simply handle
enabling/disabling build optimizations based on flags. Now all
optimizers (aside from the no-op NullOptimizer will have their enabling
built into the base class, and also necessitate their get_build_targets
and package_outputs functions to be defined in order to not error out.
Add the GeneralTestsOptimizer class as well, unimplemented for now.

Test: atest build_test_suites_test
Bug: 358215235
Change-Id: Ide22c64fc238d754db8d8e76484947401e54e680
2024-08-08 12:02:57 -07:00
Treehugger Robot
0038482750 Merge "Update sts-sdk to use new source" into main am: 9fe7f1fa9e
Original change: https://android-review.googlesource.com/c/platform/build/+/3206023

Change-Id: I756c12981f92d3e208b125cbcd3288d7d6135af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-08 18:36:09 +00:00
Treehugger Robot
9fe7f1fa9e Merge "Update sts-sdk to use new source" into main 2024-08-08 18:19:28 +00:00
Inseob Kim
d05947dd12 Build product/odm build.prop with Soong
Bug: 322090587
Test: compare build.prop before and after, boot
Change-Id: Iab157cf313d62c1c95ef66dd0a2b9563ee60ab46
2024-08-08 17:48:43 +09:00
yangbill
43c861469d Export related make variables for gralloc.default to soong
Bug: 356533884
Test: ./prebuilts/build-tools/linux-x86/bin/py3-cmd build/bazel/ci/rbc_dashboard.py --quick
Change-Id: I05849a6f20aae807d47c9cf46d127234d53c36e8
2024-08-08 07:35:58 +00:00
Android Build Coastguard Worker
2c314e9fb3 [coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L48700030005686605 into 24Q3-release.
COASTGUARD_SKIP: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
COASTGUARD_SKIP: Ia57ae5d45ff59cb31bac1abf985a5e9e466be096

Change-Id: I03248cd4692092e938c2ded13379f15816b8eaa3
2024-08-08 05:08:24 +00:00
Android Build Coastguard Worker
67aa8ba288 Make change and version bump to AP3A.240905.014.X1
Merge cherrypicks of ['android-review.googlesource.com/3028111'] into sparse-12192237-L48700030005686605.
SPARSE_CHANGE: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820

Change-Id: Ia57ae5d45ff59cb31bac1abf985a5e9e466be096
2024-08-08 05:06:10 +00:00
Lokesh Kumar Goel
b9da7e704e Allow PLATFORM_BASE_OS override from product config
PLATFORM_BASE_OS is used to set value for
ro.build.version.base_os which is used to qualify
a device build as SMR (Security Maintenance Release)
during APFE (Android Partner Approval) to optimize the test span.
See ag/26859560 on how we plan to use this variable.

Add PRODUCT_BASE_OS that can be used to override
PLATFORM_BASE_OS value before making it read_only.

Plan is to set the value for PRODUCT_BASE_OS using build flags.
This way, it can be easily set per device when making on-demand
SMR releases. In future, move it to be set via soong variable
during build process once build system side is ready.

Test: None
Bug: 155105803
(cherry picked from https://android-review.googlesource.com/q/commit:c4baa3aa7240e1b0cb013f853669aa419e55ee1e)
Merged-In: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
Change-Id: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
2024-08-08 05:04:28 +00:00
Zhi Dou
86c236caef [automerger skipped] Merge "DO NOT MERGE: manually cherry pick" into main am: fa47605191 -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3212155

Change-Id: If3dfa0d4007f4fd314fcc2f52e47e584f2fdb169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 20:47:46 +00:00
Zhi Dou
a22150427a [automerger skipped] DO NOT MERGE: manually cherry pick am: 8ee1a5b785 -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3212155

Change-Id: Idd6b1f7d22956d9bd93ae46e59a80ed423c05054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 20:47:40 +00:00
Zhi Dou
fa47605191 Merge "DO NOT MERGE: manually cherry pick" into main 2024-08-07 20:23:41 +00:00
Zhi Dou
8ee1a5b785 DO NOT MERGE: manually cherry pick
Change-Id: I47b6d783f32b7c260dd806898ed880901b5f784b
Test: presubmit
Bug: n/a
2024-08-07 18:51:23 +00:00
Android Build Coastguard Worker
bf6d5c483f [coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L21000030005708971 into 24Q3-release.
COASTGUARD_SKIP: I8fc12d96524bb162b3182f4865d63dd92c1ca334

Change-Id: I040299859921f535737a55d630152a613878c3b3
2024-08-07 18:20:03 +00:00
Android Build Coastguard Worker
41b8912700 Version bump to AP3A.240905.014.Z1 [core/build_id.mk]
Change-Id: I8fc12d96524bb162b3182f4865d63dd92c1ca334
2024-08-07 18:18:56 +00:00
Bart Van Assche
c9b210753c Merge "base_vendor.mk: Add filterPowerSupplyEvents.o" into main am: 671dd3c7af
Original change: https://android-review.googlesource.com/c/platform/build/+/3202150

Change-Id: I3efe5e6ef1e07d94e72c7644d66be9b52950e5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 00:21:49 +00:00
Bart Van Assche
671dd3c7af Merge "base_vendor.mk: Add filterPowerSupplyEvents.o" into main 2024-08-06 23:51:23 +00:00
Android Build Coastguard Worker
36777736f4 Version bump to AP3A.240905.014 [core/build_id.mk]
Change-Id: I361c4f8c70338f5e2280ca28be8be6abab0397fc
2024-08-06 22:35:49 +00:00
Android Build Coastguard Worker
1c63ceefca Version bump to AP3A.240905.013 [core/build_id.mk]
Change-Id: Ib004149c4f7276560fc9234300b06733fbea57bc
2024-08-06 22:10:02 +00:00
Treehugger Robot
480893a301 Merge "Read from new storage in Java codegen" into main am: 70270692d0
Original change: https://android-review.googlesource.com/c/platform/build/+/3208150

Change-Id: Ibb96980bf396884677adf013319637ec7ac079b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:21:16 +00:00
Treehugger Robot
70270692d0 Merge "Read from new storage in Java codegen" into main 2024-08-06 21:16:42 +00:00
Treehugger Robot
3a716b42b1 Merge "change thread policy to allow read disk" into main am: 0284610ba7
Original change: https://android-review.googlesource.com/c/platform/build/+/3208534

Change-Id: I1d6d663dad4b214e9c2b3f90be623044cb7c4b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:14:28 +00:00
Treehugger Robot
0284610ba7 Merge "change thread policy to allow read disk" into main 2024-08-06 20:57:22 +00:00
Ted Bauer
06560bed93 Read from new storage in Java codegen
Change-Id: I8baa089f37dcc496096e124d605f08727647053c
Test: m
Bug: 312235596
2024-08-06 19:34:33 +00:00
Zhi Dou
f5f5992893 change thread policy to allow read disk
Bug: 356614910
Test: presubmit
Change-Id: I65cc2cbd5e17b1ee93e64d8b20e53c42547c985a
2024-08-06 18:58:45 +00:00
Treehugger Robot
6d8e46e28d Merge "Install cppreopts.sh to copy dexpreopt files on first boot" into main am: a490d1bf68
Original change: https://android-review.googlesource.com/c/platform/build/+/3208470

Change-Id: I4f819cf3314a0fbb6c2e04e73497b6b777d6e252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:42:51 +00:00
Treehugger Robot
a490d1bf68 Merge "Install cppreopts.sh to copy dexpreopt files on first boot" into main 2024-08-06 18:40:40 +00:00
Wei Li
476dfe4901 Merge "Switch SBOM generation of products to Soong and remove the function in Make." into main am: 9489a0835c
Original change: https://android-review.googlesource.com/c/platform/build/+/3207010

Change-Id: I63a231448c621a4a6849ca0e512673c4b7bacc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:21:23 +00:00
Wei Li
9489a0835c Merge "Switch SBOM generation of products to Soong and remove the function in Make." into main 2024-08-06 18:17:36 +00:00
Treehugger Robot
2a35606022 Merge "core/Makefile: Add desktop recovery image target hook" into main am: f4a9dab360
Original change: https://android-review.googlesource.com/c/platform/build/+/3204738

Change-Id: I59438963a2c41fcc7d8488cd0797c276db814889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:15:42 +00:00