Commit Graph

9433 Commits

Author SHA1 Message Date
Inseob Kim
ae5a816be5 Merge "Move adb_keys to product partition" into main am: 1a3f842d48
Original change: https://android-review.googlesource.com/c/platform/build/+/3243935

Change-Id: Ia04f80cb4b86df614f9d4f3b1ce342f5d541c9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-30 01:12:46 +00:00
Inseob Kim
ff517c6151 Move adb_keys to product partition
/adb_keys will be moved to /product/etc/security as it's a
product-specific file. To prevent regression, /adb_keys will be a
symlink to the new location.

Bug: 353430323
Test: boot and connect adb with ADB_VENDOR_KEYS
Change-Id: Ieee2974925df4b3797483c96b78a0d2a2aa9a57d
2024-08-27 17:48:46 +09:00
Treehugger Robot
8867cacc31 Merge "Move large_screen_common.mk to AOSP" into main am: 7337727e7a
Original change: https://android-review.googlesource.com/c/platform/build/+/3220401

Change-Id: I296e3dad3c329af54bef78d68448c377ab683eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 22:39:30 +00:00
Raul E Rangel
d44b475942 Move large_screen_common.mk to AOSP
Move this to AOSP to allow partners easier access to the file.

Bug: 357647152
Test: m
Change-Id: I8b21b1461298fbde97e9f5b78bb519c6be864118
2024-08-15 10:22:10 -06: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
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
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
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
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
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)
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
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
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
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
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
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
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
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
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
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
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
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
Sid Nayyar
8afaf50faf Merge "Add kernel lifetimes and approved OGKI builds configs to GSI" into main 2024-07-23 16:32:58 +00:00
yangbill
90b90af5f6 Add BOARD_PERFSETUP_SCRIPT as a soong config variable
This variable is used to customize different perf script used by
perf-setup under platform_testing/scripts/perf-setup/.
This CL also add perf-setup.sh by default installed for eng and
userdebug build.

Bug: 343133111
Test: . build/envsetup.sh; lunch aosp_akita-trunk_staging-userdebug;\
      m perf-setup
Test: . build/envsetup.sh; lunch aosp_panther-trunk_staging-userdebug; \
      m perf-setup
Test: . build/envseup.sh; lunch aosp_cf_x86_64_phone-trunk_staging-userdebug; \
      m perf-setup
Change-Id: I0f81f5296aa59bef5b5d608a6cfda6d8b05b4e0f
2024-07-23 02:49:41 +00:00
Treehugger Robot
85acc17f4f Merge "Remove PRODUCT_SHIPPING_API_LEVEL in assemble_vintf" into main am: a6fe9e7ebd
Original change: https://android-review.googlesource.com/c/platform/build/+/3184019

Change-Id: Id13b30f3f828a88afe2bbefda0e33c52c9549bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 02:32:22 +00:00
Treehugger Robot
a6fe9e7ebd Merge "Remove PRODUCT_SHIPPING_API_LEVEL in assemble_vintf" into main 2024-07-23 01:57:09 +00:00
Parth Sane
11c5c7dc01 Merge "Export the libbinder flag to Android.bp" into main am: 01e6b4bc51
Original change: https://android-review.googlesource.com/c/platform/build/+/3182281

Change-Id: Ie04b56bd6f82f472e6a2ad77863134fa74bb1055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-22 12:42:54 +00:00
Parth Sane
01e6b4bc51 Merge "Export the libbinder flag to Android.bp" into main 2024-07-22 12:22:05 +00:00
Sid Nayyar
0ddd61a73f Add kernel lifetimes and approved OGKI builds configs to GSI
These kernel configs are required for end-of-life enforcement and OGKI
compliance verification VTS tests.

Bug: 338636324
Bug: 342094847
Test: manually built and flashed on device, device had config files
Change-Id: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
2024-07-21 09:17:57 +00:00
Christopher Ferris
589e40b26d Merge "Replace PRODUCT_DISABLE_SCUDO with MALLOC_LOW_MEMORY." into main am: 3b8f6ebbb7
Original change: https://android-review.googlesource.com/c/platform/build/+/3185682

Change-Id: I014b7aa9aac03ab2565c1b1c8b319bb51e1c48c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-20 01:51:15 +00:00