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
Luca Farsi
14f6de4afc
Merge "Don't build targets if they're not used." into main am: 1ef9d680af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204820
Change-Id: I1ac01bec631994f39c7086d55dafb3befb608427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:03:12 +00:00
Luca Farsi
1ef9d680af
Merge "Don't build targets if they're not used." into main
2024-08-02 23:36:03 +00:00
Android Build Coastguard Worker
94d9187289
Version bump to AP3A.240905.010 [core/build_id.mk]
...
Change-Id: I3c228ef0c8da259bbd405918c12ca87fbbc76a3b
2024-08-02 22:32:14 +00:00
Luca Farsi
b24c1c3dbd
Don't build targets if they're not used.
...
Add functionality in build_test_suites.py to not build targets if
their outputs are not used in the test configurations saved in the build
context. If none of the tests reference the targets' outputs they will
not be built at all.
Note that the corresponding flags will need to be enabled for these
optimizations to take place.
Test: atest optimized_targets_test
Bug: 348489774
Change-Id: I8f0ac90e75552ae80073f13229b026c7f23476a6
2024-08-02 14:45:36 -07:00
Chris Dombroski
1b569e4dd3
Update sts-sdk to use new source
...
Test: builds
Bug: 325295485
Change-Id: Iced085665b567eb675e3ee4ff54070d542b97f7d
2024-08-02 21:31:31 +00:00
Spandan Das
9c54f38250
Prevent misconfigured cp_system_other_odex=1 device boots
...
https://r.android.com/3177659 set ro.cp_system_other_odex=1 to request
copy of the dexpreopt app images to system_other partition on first
boot. This created a misconfiguration for devices that
1. Do not have a system_other partition
2. Do not have cppreopts.sh listed in PRODUCT_PACKAGES
This CL adds a conditional to request this copy operation in devices
with a system_other partition, and adds cppreopts.sh to PRODUCT_PACKAGES
Test: presubmits
Bug: 356075780
Change-Id: I703c15a5fd96d1efad7f93e6bcb1b968ae4f38a1
2024-08-02 21:28:00 +00:00
Lokesh Kumar Goel
8d2c3f399b
Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3028111
Change-Id: Ie0699447315012d2a1832ddeb4b0d5f827a3f32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 15:16:14 +00:00
Lokesh Kumar Goel
a4007985ec
Merge "Allow PLATFORM_BASE_OS override from product config" into main
2024-08-02 14:55:29 +00:00
Automerger Merge Worker
a74c3088ae
Merge changes from topic "am-606f4760fe694687b9188f486060d18f" into main am: 55ebcbb3aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: Ied09d8c54948fb4e5fdae6fcdddf821aba7fa51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:30 +00:00
Chaitanya Cheemala (xWF)
b1ef8b4218
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours am: 4a1a977f47
-s ours am: 5b0ef41b45
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: I6c9c116132e4cab544e324bed2078ffeae56e47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:27 +00:00
Automerger Merge Worker
950d4bc32c
Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev am: 575462fb40
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: Ic3710ddba51ddfab5e4eea20837696d1dac85889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:22 +00:00
Chaitanya Cheemala (xWF)
cfbec28b97
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours am: 4a1a977f47
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: I8f47675cc5cf1788ee3c93c92931fbe2a1be7465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:15 +00:00
Automerger Merge Worker
55ebcbb3aa
Merge changes from topic "am-606f4760fe694687b9188f486060d18f" into main
...
* changes:
Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev am: 575462fb40
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours am: 4a1a977f47
-s ours
2024-08-02 13:33:22 +00:00
Automerger Merge Worker
ccdfce4a7e
Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev am: 575462fb40
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: Ib54761538b84092600c1ffdd86891fc1b6d8828a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:33:10 +00:00
Chaitanya Cheemala (xWF)
5b0ef41b45
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours am: 4a1a977f47
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: I2cbe03efb8f45618dbcd39d98307050a3126267e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:33:05 +00:00
Automerger Merge Worker
575462fb40
Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev
...
* changes:
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours
[automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683
-s ours
2024-08-02 13:20:59 +00:00
Chaitanya Cheemala (xWF)
4a1a977f47
[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: Ic5acf9eab78143dbe59c51b63a6f295bf732963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:20:52 +00:00
PODISHETTY KUMAR (xWF)
e58df3f353
[automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: I850cc7a44ca630670911767c456133f82685a560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:20:46 +00:00
Chaitanya Cheemala (xWF)
1b7445982b
Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev
2024-08-02 13:08:54 +00:00
yangbill
c0db374be7
Export variable to soong for converting vintf_compatibility_matrix
...
Bug: 352234038
Bug: 344445679
Test: m
Change-Id: Idf1002d8238f4657ce8787077be5dfcc6d57013e
2024-08-02 08:36:36 +00:00
Jae Hoon Kim
3a38f1f108
core/Makefile: Add desktop recovery image target hook
...
.. allowing for targets to trigger recovery image builds.
Bug: b:343235730, b:355487693
Test: m, with desktop target enabling PACK_DESKTOP_RECOVERY_IMAGES
Flag: EXEMPT desktop only change
Change-Id: Idd5483747283aeba8086a90b7eb0590e47b9549e
2024-08-02 06:55:49 +00:00
PODISHETTY KUMAR (xWF)
68a4dda683
Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."
...
This reverts commit 11840e42bd
.
Reason for revert: <Droidmonitor created revert due to b/356996882. Will be verifying through ABTD before submission.>
Change-Id: I1813b8f1215f42c2ae8421f19ff25f507604b385
2024-08-02 06:01:02 +00:00
Android Build Coastguard Worker
9bc2ab1cb6
Version bump to AP3A.240905.009 [core/build_id.mk]
...
Change-Id: I2673bd3bbad1dd3127d2fffbfa70c77c8a0461e2
2024-08-02 05:57:29 +00:00
Automerger Merge Worker
aa1f214192
Merge changes from topic "am-2b845371bfb24cbda58a356f9712fc87" into main am: f297060a02
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: Ia58c3497f73a3156b1d88018e1368362f99e4b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:38:57 +00:00
Ziwei Zhang
dfc08a501f
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36
-s ours am: 1513cac5ae
-s ours am: 29cef0f2c5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: Ic916fc3db555f6b2447c347a3ae3e735bcee0bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:38:53 +00:00
Automerger Merge Worker
c0931b8c1b
Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev am: 4f0f22ed65
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: I200a292d8571183fee6867c97e76357b58795424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:18:18 +00:00
Ziwei Zhang
f4c234f8d0
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36
-s ours am: 1513cac5ae
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: I681704cbe71822f729f01106f2ccfcd1a675b98d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:18:08 +00:00
Automerger Merge Worker
f297060a02
Merge changes from topic "am-2b845371bfb24cbda58a356f9712fc87" into main
...
* changes:
Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev am: 4f0f22ed65
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36
-s ours am: 1513cac5ae
-s ours
2024-08-02 05:18:01 +00:00