Commit Graph

37796 Commits

Author SHA1 Message Date
Inseob Kim
7769628658 Merge changes from topic "revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ" into main am: 409209f02c
Original change: https://android-review.googlesource.com/c/platform/build/+/3195816

Change-Id: Id929f5bec806c1206fc06930415fd3c9b2408a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 10:39:00 +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)
9a046515db Revert "Revert^2 "Add more variables for system/build.prop migra..."
Revert submission 3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

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

Reverted changes: /q/submissionid:3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR

Change-Id: Idaad375a3a34252b85169ee37ac97f1b02670cea
2024-07-25 09:21:09 +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
2a777529d9 Revert^2 "Add more variables for system/build.prop migration" am: 50061ea370
Original change: https://android-review.googlesource.com/c/platform/build/+/3195641

Change-Id: Idae6960b580dcafc454b9b53448fa5c4cb6ae2a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 07:39:27 +00:00
Inseob Kim
50061ea370 Revert^2 "Add more variables for system/build.prop migration"
2254142ec5

Change-Id: Iec3a7b1e65b551708faa6e4420566bfc9267c601
2024-07-25 03:27:49 +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
34c796bd52 Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main am: bcacc9c6de
Original change: https://android-review.googlesource.com/c/platform/build/+/3195635

Change-Id: I38212c120d2cff158ab4bf4905d28335392def43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:51:14 +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
bcacc9c6de Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main
* changes:
  Revert "Add more variables for system/build.prop migration"
  Revert "Use Soong-built system/build.prop"
2024-07-25 02:48:23 +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
2254142ec5 Revert "Add more variables for system/build.prop migration"
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: I9bea079d476ea28e83dbb356defa646e662ad830
2024-07-25 02:45:53 +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
6ea1853c9f Add more variables for system/build.prop migration am: 78f9be7a4e
Original change: https://android-review.googlesource.com/c/platform/build/+/3184459

Change-Id: I49792bc34558b477701eee5f4dccdef42b1529d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 02:08:22 +00:00
Inseob Kim
30a477d9b0 Merge changes from topic "system_build_prop_soong" into main
* changes:
  Use Soong-built system/build.prop
  Add more variables for system/build.prop migration
2024-07-25 02:07:00 +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
Inseob Kim
78f9be7a4e Add more variables for system/build.prop migration
Bug: 322090587
Test: build
Change-Id: I499928ee2bdc53e654fd83b5ab5d609a3957ace6
2024-07-24 17:15:59 +09:00
Treehugger Robot
9713927d75 Merge "Add soong config for early VM" into main am: 3d99e42579
Original change: https://android-review.googlesource.com/c/platform/build/+/3186540

Change-Id: Ia3dad9101e141a98ef57d9eceb7a01c0158ff43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 05:06:07 +00:00
Treehugger Robot
3d99e42579 Merge "Add soong config for early VM" into main 2024-07-24 04:54:24 +00:00
Kiyoung Kim
8008e22acf Merge "Remove VSDK related code from build" into main am: deb62cbc41
Original change: https://android-review.googlesource.com/c/platform/build/+/3188140

Change-Id: I817e2a414b33aa28ce6460676fa3c43a74e42321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 03:52:43 +00:00
Kiyoung Kim
deb62cbc41 Merge "Remove VSDK related code from build" into main 2024-07-24 03:31:44 +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
Automerger Merge Worker
bb8c0996dc Merge "Merge "Merge "Exclude mcts tests from cts based on the env config." into android13-tests-dev am: b4a761670b" into android14-tests-dev am: bee2154347" into main am: f650dbab88
Original change: https://android-review.googlesource.com/c/platform/build/+/3164466

Change-Id: Ib7febe2a6c6406df8395671ca6914954d8931bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 09:17:27 +00:00
Automerger Merge Worker
c04c460c90 Merge "Merge "Exclude mcts tests from cts based on the env config." into android13-tests-dev am: b4a761670b" into android14-tests-dev am: bee2154347
Original change: https://android-review.googlesource.com/c/platform/build/+/3164466

Change-Id: I923d105c505163cff9c248d5a656e08e0d104d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 08:54:12 +00:00
Tongbo Liu
52d1efe5ad Merge "Exclude mcts tests from cts based on the env config." into android13-tests-dev am: b4a761670b
Original change: https://android-review.googlesource.com/c/platform/build/+/3164466

Change-Id: Iacbd646afa215fbd741a84921c81ccc548457f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 08:36:10 +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
Kiyoung Kim
6f701b2882 Remove VSDK related code from build
Remove leftover VSDK related code from build, as they are no longer in
use.

Bug: 332986564
Test: AOSP CF build succeeded
Change-Id: Idb34adc37022e71603f150200635ef1fb81e8ec4
2024-07-23 11:29:31 +09:00
Inseob Kim
42ed91a914 Add soong config for early VM
Bug: 354059066
Test: build
Change-Id: I0efc023b307694809b68f1e84a649c1578eca313
2024-07-23 11:18:41 +09:00
Treehugger Robot
f4a1f5c79e Merge "Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong" into main am: d9fc22aeda
Original change: https://android-review.googlesource.com/c/platform/build/+/3181879

Change-Id: I9c03278e1b3a23c43af063cbc36ab9f5f0a01829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-19 03:36:13 +00:00
Treehugger Robot
d9fc22aeda Merge "Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong" into main 2024-07-19 03:21:23 +00:00
Kiyoung Kim
c7fea48094 Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong
Pass PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD to Soong so it can decide if
ART debug APEX should be used instead of ART APEX

Bug: 351698657
Test: AOSP CF eng build succeeded
Change-Id: I1e0683be5cd66f1a18e7aec5b1d96ac6e5f4588a
2024-07-19 10:14:05 +09:00
LaMont Jones
be651f34e5 Merge "Pass the target product to release-config" into main am: 1997e9f786
Original change: https://android-review.googlesource.com/c/platform/build/+/3182792

Change-Id: I4af482b78d5b4e9cbda427f30b1a23b4762569ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 23:20:29 +00:00
Michael Wright
41b64550d8 Pass the target product to release-config
If you don't, release-config will read the TARGET_PRODUCT environment
variable to determine the product. This works in most cases, but it's
possible (e.g. via buildspec.mk) to change the target product within
make without modifying the environment variable. In these cases,
release-config will produce the config for one product but then the
build will read the config for a completely different product, leading
to build errors.

Instead, just pass the target product to release-config explicitly so it
generates the config for the product that the build is expecting.

Bug: 353351911
Test: TARGET_SKIP_OTA_PACKAGE="true" build/soong/soong_ui.bash \
    --make-mode TARGET_PRODUCT=apps TARGET_RELEASE=next \
    TARGET_BUILD_VARIANT=user droid dist \
    ANDROID_BUILDSPEC=vendor/google_clockwork/build/app_build_spec.mk \
    ALLOW_MISSING_DEPENDENCIES=true \
    UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \
    RELAX_USES_LIBRARY_CHECK=true
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:310d7718439d074fe38b25b97eb609f6db66c3d6)
Merged-In: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
Change-Id: I63e80249ac702b5517f4a3cfd54c8a4dbd416794
2024-07-18 20:36:10 +00:00
Treehugger Robot
01be392dd1 Merge "Use JDK 21 instead of 17" into main am: 726c69d608
Original change: https://android-review.googlesource.com/c/platform/build/+/3182280

Change-Id: If664ea4a23b26828db1d96c05fe39ccbd6125774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 17:30:21 +00:00
Sorin Basca
ba29ac54f4 Use JDK 21 instead of 17
Bug: 342332820
Test: TH
Change-Id: Id040a389243220eb4c5b47631bfdd9f27bc00923
2024-07-18 12:05:19 +01:00
Tongbo Liu
15c19082d4 Exclude mcts tests from cts based on the env config.
Change-Id: Ife879a0553076f4bf2a5e9835807fbf5a86dea27
Merged-In: Ife879a0553076f4bf2a5e9835807fbf5a86dea27
Test: make cts EXCLUDE_MCTS=true
Bug: 345592291
2024-07-18 08:49:11 +00:00
Treehugger Robot
2e1057b9d8 Merge "Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:" into main am: 60f44e93a8
Original change: https://android-review.googlesource.com/c/platform/build/+/3178919

Change-Id: Iffdd9727163646ef07a6b842221d200c56de6864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 06:24:11 +00:00
Treehugger Robot
60f44e93a8 Merge "Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:" into main 2024-07-18 05:52:52 +00:00
Treehugger Robot
c721c82ade Merge "Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT as a soong config variable" into main am: 083e56837b
Original change: https://android-review.googlesource.com/c/platform/build/+/3163959

Change-Id: I0cc55e4f8c17d8e6ea883513cbda19dd649999ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-18 01:08:35 +00:00
Treehugger Robot
083e56837b Merge "Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT as a soong config variable" into main 2024-07-18 00:44:49 +00:00
Nikita Putikhin
6e25f26dab Merge "Use test install base template instead of a hardcoded path" into main am: bd0cba45be
Original change: https://android-review.googlesource.com/c/platform/build/+/3176019

Change-Id: Ic82c841725dd995748917dd2e0ccfd1281e2b097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-17 11:49:12 +00:00
Nikita Putikhin
bd0cba45be Merge "Use test install base template instead of a hardcoded path" into main 2024-07-17 11:34:28 +00:00
Nelson Li
39f5cc4153 Add ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED to Soong config variables:
`SANITIZE_TARGET` is a variable in Android's build system used to
enable sanitizers. Currently, Soong only supports enabling SANITIZE for
individual modules in Android.bp.
Adding ASAN_ENABLED and SANITIZE_TARGET_SYSTEM_ENABLED as Soong config
variables would allow Soong to also support building with Sanitizers by
directly setting the SANITIZE_TARGET environment variable.

Bug: 353164536
Test: SANITIZE_TARGET_SYSTEM=true SANITIZE_TARGET=address m -j asan_extract
Change-Id: I542239ee25d210d903d2481a2b1426f756656308
2024-07-17 16:56:58 +08:00
Nelson Li
12c7751ff2 Add BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT as a soong config variable
This variable allow customizing whether the `ramdisk` and
`vendor_ramdisk` are included in the boot image (ramdisk) or the
vendor boot image (vendor_ramdisk). This is useful for devices that
move recovery resources to the vendor boot partition

Bug: 347636127
Test: Add it to soong_config_module_type
Change-Id: If7a126fe8bdc69173921c0b01f85fb9480f4a36f
2024-07-17 12:02:59 +08:00
Nikita Putikhin
8722201866 Use test install base template instead of a hardcoded path
** This CL reapplies aosp/3150696. Now it is connected to a
corresponding change in rust soong module to ensure system test dir does
not change to avoid b/350479879. **

Make the template more consistent with the native (aka cc) test temlate.

The important change is that vendor tests will be pushed into
/data/local/tests/vendor.

Having the test binary in the vendor test folder makes the linker treat
it as a vendor binary and prefer vendor libraries. Previously, the test
binary was always a system binary (due to being in /data/local/tmp) and
used system libraries first potentially leading to bugs (e.g. the one
attached).

This change also makes vendor tests that use vendor libraries require
root due to an existing SELinux policy issue with atest.

Bug: 347370677
Test: checked with:
 - libsecretkeeper_core_test
 - libauthgraph_boringssl_test
 - libdice_policy.test
 Test steps:
 atest -d <test>.vendor # runs vendor variant, passes
 adb root
 adb shell find / -iname <test> 2>/dev/null
 # before change: /data/local/tmp/<test>
 # after change: /data/local/tests/vendor/<test>
Test: v2/android-kvm-team/avf_presubmit_tests
Change-Id: I19793bd20bc23ff0c78e622bc6b93f9a90d725c0
2024-07-16 12:41:19 +00:00
Inseob Kim
235076ff5e Merge changes from topic "cf_system_root_files" into main am: 94d502200c
Original change: https://android-review.googlesource.com/c/platform/build/+/3163175

Change-Id: I6b864e73b7179186ffd4e68d096b754df1927bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-16 05:11:17 +00:00
Inseob Kim
94d502200c Merge changes from topic "cf_system_root_files" into main
* changes:
  Add option to use Soong defined system image
  Add files installed to root to diff allowlist
2024-07-16 04:52:08 +00:00
Inseob Kim
8b6f143b0c Add option to use Soong defined system image
By `USE_SOONG_DEFINED_SYSTEM_IMAGE`, a system image specified by
PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE will replace $OUT/system.img.

Bug: 350599472
Test: USE_SOONG_DEFINED_SYSTEM_IMAGE=true m && cvd start
Change-Id: I294ea5e1ce7f9273d0dafc440320b8f194ccf5ca
2024-07-16 03:01:40 +00:00