Commit Graph

100074 Commits

Author SHA1 Message Date
Treehugger Robot
e32fdf859d Merge "Rename to HsumDefaultConfigOverlay" into main 2024-08-07 04:11:03 +00:00
Bart Van Assche
c7eeeed3f8 Merge "base_vendor.mk: Add filterPowerSupplyEvents.o" into main am: 671dd3c7af am: c9b210753c
Original change: https://android-review.googlesource.com/c/platform/build/+/3202150

Change-Id: I64f2130b8705805429ceb0c2c9a414cdcfa13962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-07 00:35:20 +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
Treehugger Robot
9f6931d580 Merge "Read from new storage in Java codegen" into main am: 70270692d0 am: 480893a301
Original change: https://android-review.googlesource.com/c/platform/build/+/3208150

Change-Id: I9ef4e581d7420b0abe27d50fa2d3c850c17d18bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:45:10 +00:00
Treehugger Robot
765501c5e5 Merge "change thread policy to allow read disk" into main am: 0284610ba7 am: 3a716b42b1
Original change: https://android-review.googlesource.com/c/platform/build/+/3208534

Change-Id: Ib699a7e27ff55ff0f9d43ac8eaa6c42d590d3019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 21:44:43 +00:00
Adam Bookatz
3031794a7c Rename to HsumDefaultConfigOverlay
As a workaround to a caching bug, we rename
the old HsumConfigOverlay to HsumDefaultConfigOverlay.

Bug: 357828774
Test: manual (flash build from a week ago, flash this build without
      wiping, make sure the system boots)
Flag: EXEMPT refactor (and bug fix)
Change-Id: I80de7764ef9661740bf48ff01d2f2eee001d9ff9
2024-08-06 16:22:43 -05: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
4574041dea Merge "Install cppreopts.sh to copy dexpreopt files on first boot" into main am: a490d1bf68 am: 6d8e46e28d
Original change: https://android-review.googlesource.com/c/platform/build/+/3208470

Change-Id: If4424ee39524d7800cea5dd22a10e9f1bab0c66f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:43:34 +00:00
Wei Li
cbcfdbf003 Merge "Switch SBOM generation of products to Soong and remove the function in Make." into main am: 9489a0835c am: 476dfe4901
Original change: https://android-review.googlesource.com/c/platform/build/+/3207010

Change-Id: Iaa4ffd5024bf1cb77bc75a3467083edefd5a57ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:42:57 +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
a355cba516 Merge "core/Makefile: Add desktop recovery image target hook" into main am: f4a9dab360 am: 2a35606022
Original change: https://android-review.googlesource.com/c/platform/build/+/3204738

Change-Id: I0bed59322ce4714e32fdcc670923ec13c2abe5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 18:42:01 +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
Ted Bauer
9f6335e99e Merge "Return new storage value when flag enabled" into main 2024-08-06 14:12:09 +00:00
Spandan Das
5570d3b5b3 Merge "Move the installation rules of device boot images to soong" into main am: 699f9be18a am: 1c259673d4
Original change: https://android-review.googlesource.com/c/platform/build/+/3199942

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

Change-Id: I05c78eb8b1ece769b66573ae3e25fdd1c1d6cb63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-06 10:36:20 +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
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
Ted Bauer
1a8d84dd1e Return new storage value when flag enabled
Bug: 312235596
Test: m
Change-Id: I42a8bc5389f973a2d9878deec6ee7ec186f82edf
Ignore-AOSP-First: CP afterwards
2024-08-05 21:19:45 +00:00
Ted Bauer
90ad448752 Make aflags put instead of override
Change-Id: I0a09a661f8d75c5d1540313341a1cf3f704e5020
Test: m
Bug: 324436145
Flag: EXEMPT test only
Ignore-AOSP-First: CP to AOSP afterwards
2024-08-05 19:22:56 +00:00
Makoto Onuki
be074d0dbb Merge "[Ravenwood] Use default socket timeout" into main am: c60b50c29c am: bc12852083
Original change: https://android-review.googlesource.com/c/platform/build/+/3205392

Change-Id: I6dbf941d92097745e7a74bfaa3c06b1f023a0bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 16:29:44 +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
e501cac6c8 Merge "change fileinputstream to filechannel" into main am: b7bb53d392 am: 23b0cba8d6
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I5f736f7952dd791bc2a330ef6a0b56917a7d8987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 14:47:56 +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)
7f9777ece9 Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main am: 556f030c41 am: 3c45bf096a
Original change: https://android-review.googlesource.com/c/platform/build/+/3204712

Change-Id: I7e4754529e73c600c8453dc0f5cfb08aed38cab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 06:27:28 +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
f31afeec91 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main am: fa154fd697 am: 1fd4fea110
Original change: https://android-review.googlesource.com/c/platform/build/+/3205048

Change-Id: I4fe05bb983cc2cd7cea2ac86550d95abf4f7c07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-05 02:53:04 +00: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
Treehugger Robot
9355a45b45 Merge "HSUM configuration in AOSP" into main 2024-08-03 03:08:17 +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
3123dae407 Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future am: f0bb3a69d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28602127

Change-Id: If5eb123645525f1c03f8164a590b5105598db831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-03 00:44:55 +00:00