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
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
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
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
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
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
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
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
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
Inseob Kim
1d36ed3c83
Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main am: 0c7915558e
am: a59d703cb9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3201036
Change-Id: I13b4a029be1074c9c01066c73bd804ab0caddee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 00:24:03 +00:00
Inseob Kim
a59d703cb9
Merge changes from topic "revert-3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP-XOXPVYPSBJ" into main am: 0c7915558e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3201036
Change-Id: I00de7c0b81989d3aa45283c5da893c01d6c5a032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 00:05:10 +00:00
Inseob Kim
b97c96b4b3
Revert^6 "Use Soong-built system/build.prop"
...
0b2f48f0b2
Change-Id: I5d89d26945a3ab94f102633ccffa7622b5f99469
2024-07-31 02:00:41 +00:00
Liana Kazanova
e4d9698efb
Revert^5 "Use Soong-built system/build.prop" am: 0b2f48f0b2
am: 20187aadc1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200275
Change-Id: Ia1a94355f14acd67c2e3a8876bba94d00a9d75c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-31 00:05:33 +00:00
Liana Kazanova
20187aadc1
Revert^5 "Use Soong-built system/build.prop" am: 0b2f48f0b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200275
Change-Id: I01407efe544b901784b64debc6a1239dd7c597b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 23:50:56 +00:00
Liana Kazanova
0b2f48f0b2
Revert^5 "Use Soong-built system/build.prop"
...
82b8062a90
Change-Id: I25acc66023397e67c009bea26623260f828fc0b9
2024-07-30 19:14:30 +00:00
Adam Bookatz
2fce2caf01
HSUM configuration in AOSP
...
* Moves HSUM configuration to AOSP (so it can be used by anyone, and can
exist in generic systems)
* Defines a variable for selecting HSUM-variant products, that is, a way
to select an alternate version of packages when required on HSUM
devices.
* Utilises this mechanism to use an alternative version of
TelephonyProvider (that has per-user databases) on HSUM devices.
Note that HSUM refers to Headless System User Mode, which is a
particular device mode in which user 0 isn't a human user.
Bug: 331960280
Bug: 347341495
Test: builds with correct configuration, with the appropriate version of
TelephonyProvider
Ignore-AOSP-First: changes in topics with internal-first/internal-only projects
Change-Id: Ia8a1cc7dd43dbb488f1e23b7187416a528a59c5f
2024-07-30 10:59:33 -07:00
Inseob Kim
8f8de5d64c
Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main am: e72dcd549a
am: 632a96d3ba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196511
Change-Id: I6fcf0b31dbd29b1cb5c13e60b93f98be8a68da13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:28:46 +00:00
Inseob Kim
632a96d3ba
Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main am: e72dcd549a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196511
Change-Id: I69dcec674f555090d645fcf167c2ed3ab97d2502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:13:47 +00:00
Inseob Kim
e72dcd549a
Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main
...
* changes:
Revert^4 "Use Soong-built system/build.prop"
Revert "Revert "Revert^2 "Add more variables for system/build.pr..."
2024-07-30 03:51:03 +00:00
Treehugger Robot
649fc9fd2a
Merge "Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration." into main am: e110c68023
am: b93ab94f98
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3182861
Change-Id: I1942483d997d4f6b8d15ec1037c040b52115fa66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 07:26:35 +00:00
Treehugger Robot
b93ab94f98
Merge "Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration." into main am: e110c68023
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3182861
Change-Id: I31a2978ab9c97ab9c29d15536713c3dafa50790e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 07:06:32 +00:00
Nelson Li
e63be2a724
Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration.
...
This change accomplishes two things:
Adds `HOST_PREFER_32_BIT` to Soong config variables:
The `HOST_PREFER_32_BIT` environment variable is frequently used in
Android.mk files within the art/ directory. By adding it to
soong_config_variable, we make it accessible to the Soong build system,
which will be essential when converting art modules to Android.bp.
Moves `art-tools` to product configuration:
Originally, `art-tools` was a phony target added to
PRODUCT_HOST_PACKAGES. This approach is incorrect because
PRODUCT_HOST_PACKAGES should only contain actual modules, not phony
targets. We are addressing this by converting the dependencies and
conditional statements (ifeq) within `art-tools` into
PRODUCT_HOST_PACKAGES entries in base_system.mk.
Bug: 346702835
Test: m -j; Then, check related dependencies build in the system.
Change-Id: Iab252dea71c9df9d75f2701b33d3cd4d391e7f5d
2024-07-26 12:57:41 +08:00
Pechetty Sravani (xWF)
ab276fde65
Revert^3 "Use Soong-built system/build.prop" am: 70e8a1233c
am: a84c8a64b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195815
Change-Id: Ic49b09274e6180d943e3a98721b8c07e71897954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 11:02:25 +00:00
Inseob Kim
82b8062a90
Revert^4 "Use Soong-built system/build.prop"
...
70e8a1233c
Change-Id: I27c7b4b1deee0e10416d9d53820e48a25f8e26f1
2024-07-25 10:58:08 +00:00
Pechetty Sravani (xWF)
a84c8a64b9
Revert^3 "Use Soong-built system/build.prop" am: 70e8a1233c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195815
Change-Id: Ifd30901abf93b8c4759cedc05509d6bb3c414f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 10:38:52 +00:00
Pechetty Sravani (xWF)
70e8a1233c
Revert^3 "Use Soong-built system/build.prop"
...
7fa37d8e04
Change-Id: I563eb2268623fafa16d6a9bd59f79d38268cd650
2024-07-25 09:21:09 +00:00
Inseob Kim
5dd39a1b61
Merge changes from topic "revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR" into main am: 49c151a2ea
am: 5650fe64d0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195642
Change-Id: If7de10cf9f496cd228799ba38dff1ba24ee3eb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 07:57:16 +00:00
Inseob Kim
5650fe64d0
Merge changes from topic "revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR" into main am: 49c151a2ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195642
Change-Id: Ief2e853b59671e1f55a4bce57682bf393efb316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 07:39:33 +00:00
Inseob Kim
7fa37d8e04
Revert^2 "Use Soong-built system/build.prop"
...
44fe21d315
Change-Id: I105c8759dc47a52e16443550650edceae8d4e4fe
2024-07-25 03:27:49 +00:00
Inseob Kim
3b686823de
Revert "Use Soong-built system/build.prop" am: 44fe21d315
am: a32a581d17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195634
Change-Id: Id8112d4aa7d141dac6b5750f31ac6fcbe247903f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 03:06:28 +00:00
Inseob Kim
a32a581d17
Revert "Use Soong-built system/build.prop" am: 44fe21d315
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195634
Change-Id: I2de86aa95cf82392b7fc2a706baf478794bdf3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 02:51:09 +00:00
Inseob Kim
44fe21d315
Revert "Use Soong-built system/build.prop"
...
Revert submission 3184480-system_build_prop_soong
Reason for revert: breaks ndk and mainline build
Reverted changes: /q/submissionid:3184480-system_build_prop_soong
Change-Id: I3a04f39f3093e842e90947479cbe02bcfcd2ff14
2024-07-25 02:46:11 +00:00
Inseob Kim
76bc3c8c1b
Merge changes from topic "system_build_prop_soong" into main am: 30a477d9b0
am: d88b7888c8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3184460
Change-Id: Ib1b534a5a3c009c05fded2e1a7e1626ba1918ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 02:43:40 +00:00
Inseob Kim
d88b7888c8
Merge changes from topic "system_build_prop_soong" into main am: 30a477d9b0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3184460
Change-Id: Iae691cae249ee5b6edb604fe2de36525fbc9522e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 02:08:27 +00:00
Inseob Kim
63ea18a0c1
Use Soong-built system/build.prop
...
ADDITIONAL_SYSTEM_PROPERTIES and system related code in sysprop.mk and
sysprop_config.mk are removed since they are obsolete.
Bug: 322090587
Test: boot
Test: compare build.prop before and after
Change-Id: I4e5112b44c8446071e045813725b2364eb2f3ff1
2024-07-24 17:16:49 +09:00
Treehugger Robot
ef0546f219
Merge "Add BOARD_PERFSETUP_SCRIPT as a soong config variable" into main am: eb41879e1f
am: 312527a272
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3175468
Change-Id: I4aeb1d7e63fab4e60968e6dfdabdcb4e6a547b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 01:52:09 +00:00
Treehugger Robot
312527a272
Merge "Add BOARD_PERFSETUP_SCRIPT as a soong config variable" into main am: eb41879e1f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3175468
Change-Id: I64d02004cf1a5e777e2eaed61fb2bcf0224d2bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 01:37:31 +00:00
Treehugger Robot
eb41879e1f
Merge "Add BOARD_PERFSETUP_SCRIPT as a soong config variable" into main
2024-07-24 01:25:40 +00:00
Sid Nayyar
873dc9e743
Merge "Add kernel lifetimes and approved OGKI builds configs to GSI" into main am: 8afaf50faf
am: 0927824d11
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3184960
Change-Id: I6aa3897cf173cc771641ccbfd6089c97c6f8752e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 17:44:04 +00:00
Sid Nayyar
0927824d11
Merge "Add kernel lifetimes and approved OGKI builds configs to GSI" into main am: 8afaf50faf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3184960
Change-Id: If07ddd0f63a5b1759aa664ac63a23048bf305e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-23 17:24:39 +00:00