Commit Graph

99789 Commits

Author SHA1 Message Date
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
Treehugger Robot
f4a9dab360 Merge "core/Makefile: Add desktop recovery image target hook" into main 2024-08-06 17:54:42 +00:00
Bart Van Assche
2807e4aa36 base_vendor.mk: Add filterPowerSupplyEvents.o
Bug: 203462310
Test: Cuttlefish
Change-Id: Id293028335733fc83877f380d12f855cd735e85e
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-08-06 10:49:35 -07:00
Spandan Das
fcf124988d Install cppreopts.sh to copy dexpreopt files on first boot
This relands https://r.android.com/3205048 without the
`BOARD_USES_SYSTEM_OTHER_ODEX` conditional. Board config runs after
product config, so the value of `BOARD_USES_SYSTEM_OTHER_ODEX` is not
available in runtime_libart.mk

Adding cppreopts.sh to PRODUCT_PACKAGES ensures that the dexpreopt files
can be copied from system_other to /data on first boot.

Test: lunch aosp_cheetah-trunk_staging-userdebug
Test: get_build_var PRODUCT_SYSTEM_PROPERTIES # verified that ro.cp_system_other_odex=1 is present
(this was incorrectly removed from build.prop after
https://r.android.com/3205048)

Test: device boot test go/abtd https://android-build.corp.google.com/builds/abtd/run/L83800030005663221
(this failed previously with https://r.android.com/3205048)

Bug: 356075780
Change-Id: I6a596373bbbe8587620c5867fb43fcbf3f3b2b2b
2024-08-06 16:41:45 +00:00
Spandan Das
1c259673d4 Merge "Move the installation rules of device boot images to soong" into main am: 699f9be18a
Original change: https://android-review.googlesource.com/c/platform/build/+/3199942

Change-Id: I33e17fdaf0d6bd58fac8f8977dfebfe983c4d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:18:00 +00:00
Treehugger Robot
ae323c1709 Merge "Build system_ext build.prop with Soong" into main am: 905319607d
Original change: https://android-review.googlesource.com/c/platform/build/+/3204711

Change-Id: Ia558f0b18ff172de529c1b772de2db4d07012daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:15:58 +00:00
Android Build Coastguard Worker
e7cead48a1 Version bump to AP3A.240905.012 [core/build_id.mk]
Change-Id: Id7aab457f3129f412cb5d46004963b281efd23b6
2024-08-06 09:36:17 +00:00
Spandan Das
699f9be18a Merge "Move the installation rules of device boot images to soong" into main 2024-08-06 02:27:31 +00:00
Treehugger Robot
905319607d Merge "Build system_ext build.prop with Soong" into main 2024-08-06 02:00:28 +00:00
Makoto Onuki
bc12852083 Merge "[Ravenwood] Use default socket timeout" into main am: c60b50c29c
Original change: https://android-review.googlesource.com/c/platform/build/+/3205392

Change-Id: I18d549f9b1d79721829a41e08e228d32d0a85dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 16:10:22 +00:00
Makoto Onuki
c60b50c29c Merge "[Ravenwood] Use default socket timeout" into main 2024-08-05 15:45:13 +00:00
Zhi Dou
23b0cba8d6 Merge "change fileinputstream to filechannel" into main am: b7bb53d392
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I6dc7fada9780a822d2b9ad891bbe0f0f6abd1736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 14:10:49 +00:00
Zhi Dou
b7bb53d392 Merge "change fileinputstream to filechannel" into main 2024-08-05 13:49:24 +00:00
PODISHETTY KUMAR (xWF)
3c45bf096a Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main am: 556f030c41
Original change: https://android-review.googlesource.com/c/platform/build/+/3204712

Change-Id: I32fb38dba5b08138a4abc687802298b57e112790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 06:01:28 +00:00
PODISHETTY KUMAR (xWF)
556f030c41 Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main 2024-08-05 05:41:05 +00:00
PODISHETTY KUMAR (xWF)
d7e98c63e9 Revert "Prevent misconfigured cp_system_other_odex=1 device boots"
This reverts commit 9c54f38250.

Reason for revert: <Droidmonitor created revert due to b/357468332. Will be verifying through ABTD before submission.>

Change-Id: I201339aa920dcb7fec5e8b6e74b0f0ff35c91416
2024-08-05 03:55:55 +00:00
Inseob Kim
6dbd7eb601 Build system_ext build.prop with Soong
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I7b1af2e2b1fe7f107e1540d7b797c7bf489b8a0d
2024-08-05 12:50:01 +09:00
Spandan Das
1fd4fea110 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main am: fa154fd697
Original change: https://android-review.googlesource.com/c/platform/build/+/3205048

Change-Id: I0c773eed3d85023386a66b2ef06966b66490f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 02:33:16 +00:00
Spandan Das
fa154fd697 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main 2024-08-05 02:15:34 +00:00
Wei Li
4d7e700997 Switch SBOM generation of products to Soong and remove the function in Make.
Bug: 324467079
Test: m sbom
Test: m dist
Test: banchan com.android.adbd module_arm64 userdebug && m sbom && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: Ic862604acd3ad11ef238748a744a8e675d2a141a
2024-08-02 17:56:28 -07:00
Treehugger Robot
f0bb3a69d3 Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future 2024-08-03 00:21:44 +00:00
Android Build Coastguard Worker
39fdd7c40a Version bump to AP3A.240905.011 [core/build_id.mk]
Change-Id: Ief3b3961b75fe0bc72892eb6d77238e70df08b96
2024-08-03 00:14:51 +00:00
Zhi Dou
8af83ccd50 change fileinputstream to filechannel
The restrict mode doesn't allow to have disk read from main thread. Some
apps enabled this check. The code in the dependencies of the
fileinputstream. This chagne switch to filechannel.

Test: presubmit
Bug: 356614910
Change-Id: Icf2175fe75ed1bfad4a048ead680b08e57d6c2ca
2024-08-03 00:08:40 +00:00