Commit Graph

98525 Commits

Author SHA1 Message Date
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
Luca Farsi
1ef9d680af Merge "Don't build targets if they're not used." into main 2024-08-02 23:36:03 +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
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
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
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
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
Automerger Merge Worker
75fef75f4f 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: I0bc1198446a16a13ee843c2d9e3634bc628664af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 05:17:54 +00:00
Ziwei Zhang
29cef0f2c5 [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: Ic11a400b2e6d2cd0b73e922ebb66799914b3cec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 05:17:48 +00:00
Automerger Merge Worker
4f0f22ed65 Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS. am: 11840e42bd -s ours
2024-08-02 05:03:00 +00:00
Ziwei Zhang
1513cac5ae [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198231

Change-Id: If5a06d363f6dbd482b653a35676474f9dd08df62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 05:02:54 +00:00
Ziwei Zhang
ae8433307d [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS. am: 11840e42bd -s ours
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198231

Change-Id: I458567a2b0bc267aea22b86cbea3b127cec04abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-02 05:02:50 +00:00
Ziwei Zhang
8fc262ab36 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev 2024-08-02 04:52:40 +00:00
Treehugger Robot
9b6324bf40 Merge "Add art_build_host_debug to soong config variable" into main 2024-08-02 04:50:44 +00:00
Treehugger Robot
351106c236 Merge "Reland "Add variables for init.environ.rc"" into main 2024-08-02 02:28:10 +00:00
Lokesh Kumar Goel
c4baa3aa72 Allow PLATFORM_BASE_OS override from product config
PLATFORM_BASE_OS is used to set value for
ro.build.version.base_os which is used to qualify
a device build as SMR (Security Maintenance Release)
during APFE (Android Partner Approval) to optimize the test span.
See ag/26859560 on how we plan to use this variable.

Add PRODUCT_BASE_OS that can be used to override
PLATFORM_BASE_OS value before making it read_only.

Plan is to set the value for PRODUCT_BASE_OS using build flags.
This way, it can be easily set per device when making on-demand
SMR releases. In future, move it to be set via soong variable
during build process once build system side is ready.

Test: None
Bug: 155105803

Change-Id: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
2024-08-01 15:38:12 -07:00
Yurii Zubrytskyi
7575d3f967 Merge "Revert^2 "Fix signing failure for split APKs"" into main 2024-08-01 15:59:31 +00:00
ELIYAZ MOMIN
10e47e3723 Revert^2 "Fix signing failure for split APKs"
This reverts commit d06e5a83ba.

Reason for revert: <It's not a culprit any more.>

Change-Id: I405c418e6da88774b174fcb3508eb54039fbdf8e
2024-08-01 15:43:31 +00:00
Treehugger Robot
80a07d6870 Merge "Added a basic prober script to test code completion." into main 2024-08-01 12:00:01 +00:00
ELIYAZ MOMIN
8a3f6256fc Merge "Revert "Fix signing failure for split APKs"" into main 2024-08-01 10:19:11 +00:00
Ilshat Aliyev
8e13493d4d Added a basic prober script to test code completion.
Run tests locally

Change-Id: Id8b8b6b4d9b1fae9d7cd5f04a20c239628351b16
2024-08-01 08:11:45 +00:00
Treehugger Robot
ff301aa3a9 Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main 2024-08-01 07:01:29 +00:00
Pechetty Sravani (xWF)
d06e5a83ba Revert "Fix signing failure for split APKs"
This reverts commit 6871779d9b.

Reason for revert: Potential culprit for b/356752725- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I4c29b27f0318901130036dbe8ab9edef37f08875
2024-08-01 05:54:13 +00:00
Inseob Kim
ef566ac4f6 Reland "Add variables for init.environ.rc"
Relanding with a fix for hwasan build.
HWADDRESS_SANITIZER_GLOBAL_OPTIONS is set by Soong's MakeVars, so we
can't refer the variable on soong config modules. Instead, as the
variable is hard-coded, this change hard-codes options in Android.bp.

Bug: 353429422
Test: boot shiba with SANITIZE_TARGET=hwaddress
Change-Id: Idaf4417e3f51c1933264866799c211de7bd0821d
2024-08-01 03:31:28 +00:00
Inseob Kim
0c7915558e 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
* changes:
  Revert^6 "Use Soong-built system/build.prop"
  Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
  Revert^2 "Conditionally pass kernel version to build.prop"
2024-08-01 00:02:58 +00:00
Treehugger Robot
787d933f87 Merge "Fix signing failure for split APKs" into main 2024-07-31 21:06:37 +00:00
Liana Kazanova
d0b03dd868 Merge "Revert "Add variables for init.environ.rc"" into main 2024-07-31 20:49:29 +00:00
Liana Kazanova
f2289bfdd2 Revert "Add variables for init.environ.rc"
Revert submission 3197177-init_environ_rc_soong

Reason for revert: DroidMonitor: Potential culprit for b/356587212 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3197177-init_environ_rc_soong

Change-Id: I7cfe54a994179577a7f3e3f86618ff04980aaf35
2024-07-31 17:56:40 +00:00
Kelvin Zhang
6871779d9b Fix signing failure for split APKs
Test: th
Bug: 353837347
Change-Id: Ifed9746c1e1d053a97860de3bab4380d6e207412
2024-07-31 10:36:47 -07:00
Treehugger Robot
44b3f9eb39 Merge "Add variables for init.environ.rc" into main 2024-07-31 05:37:30 +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
Inseob Kim
774a6dbbe8 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

Reverted changes: /q/submissionid:3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a
2024-07-31 02:00:41 +00:00
Inseob Kim
b186331478 Revert^2 "Conditionally pass kernel version to build.prop"
ff77e22213

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513
2024-07-31 02:00:41 +00:00
Zhi Dou
3d960c5638 Merge "aconfig: make java cached indicator volatile" into main 2024-07-30 23:35:45 +00:00
Zhi Dou
39020e05c6 Merge "close file stream" into main 2024-07-30 23:35:42 +00:00
Inseob Kim
aac9b8d04f Merge changes from topic "revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP" into main
* changes:
  Revert "Conditionally pass kernel version to build.prop"
  Revert "Revert "Revert "Revert^2 "Add more variables for system/..."
  Revert^5 "Use Soong-built system/build.prop"
2024-07-30 23:30:29 +00:00
Ryan Prichard
7428bc438d Merge "Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."" into main 2024-07-30 21:42:23 +00:00
Liana Kazanova
ff77e22213 Revert "Conditionally pass kernel version to build.prop"
Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Icba8f01ef59ce969206c20981fcc17ea10378f5e
2024-07-30 19:14:30 +00:00
Liana Kazanova
dd3d5c1f3d Revert "Revert "Revert "Revert^2 "Add more variables for system/..."
Revert submission 3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA

Change-Id: Ic1c52133c80484b318f1ae72e2fd5b5fe199f9ab
2024-07-30 19:14:30 +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
Zhi Dou
97d02148b9 close file stream
Close file stream, since the in the restrict mode the runtime will check
whether all the resource is closed when it is out of scope.

Test: ABTD ImsStackJavaTests
Bug: 349874828
Change-Id: Ib297622bae730bf99e4d5d1b3adeff3fee805a93
2024-07-30 19:05:14 +00:00
Zhi Dou
36589bc318 aconfig: make java cached indicator volatile
Test: atest aconfig.test.java
Bug: 356201402
Change-Id: I1127a4092536fe199f4a7256dea0c2b289e837da
2024-07-30 18:21:43 +00:00
Luca Farsi
b67ff3e17e Merge "Properly log in build_test_suites.py" into main 2024-07-30 18:19:11 +00:00
Inseob Kim
6808b94f6d Add variables for init.environ.rc
Bug: 353429422
Test: boot cuttlefish
Change-Id: If46706c6fd89b5da2e56a84f1f7de946bdc74cb9
2024-07-30 17:48:06 +09:00