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
f0bb3a69d3
Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future
2024-08-03 00:21:44 +00:00
Luca Farsi
14f6de4afc
Merge "Don't build targets if they're not used." into main am: 1ef9d680af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204820
Change-Id: I1ac01bec631994f39c7086d55dafb3befb608427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-03 00:03:12 +00: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
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
Lokesh Kumar Goel
8d2c3f399b
Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985ec
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3028111
Change-Id: Ie0699447315012d2a1832ddeb4b0d5f827a3f32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 15:16:14 +00: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
a74c3088ae
Merge changes from topic "am-606f4760fe694687b9188f486060d18f" into main am: 55ebcbb3aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: Ied09d8c54948fb4e5fdae6fcdddf821aba7fa51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:30 +00:00
Chaitanya Cheemala (xWF)
b1ef8b4218
[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: 5b0ef41b45
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292
Change-Id: I6c9c116132e4cab544e324bed2078ffeae56e47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 13:46:27 +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
aa1f214192
Merge changes from topic "am-2b845371bfb24cbda58a356f9712fc87" into main am: f297060a02
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: Ia58c3497f73a3156b1d88018e1368362f99e4b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:38:57 +00:00
Ziwei Zhang
dfc08a501f
[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: 29cef0f2c5
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3198231
Change-Id: Ic916fc3db555f6b2447c347a3ae3e735bcee0bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:38:53 +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
Treehugger Robot
7e26d04367
Merge "Add art_build_host_debug to soong config variable" into main am: 9b6324bf40
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3189262
Change-Id: Ie9db02b47db5f8f4d5d60fddc56e3d39177ef758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 05:08:59 +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
4926d66e1b
Merge "Reland "Add variables for init.environ.rc"" into main am: 351106c236
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3203670
Change-Id: I695a9196a402832bfda4fa3b6edf4a853157b0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 02:48:05 +00:00
Treehugger Robot
351106c236
Merge "Reland "Add variables for init.environ.rc"" into main
2024-08-02 02:28:10 +00:00
Xin Li
1545a6095b
Mark AP3A.240905.001 as merged in aosp-main-future
...
Bug: 347831320
Merged-In: I5cf032164ee3086c6e79342fe4a89b1c013ee9fe
Change-Id: Ic12b218f15d360a71c0a5e392e831c4fa318167b
2024-08-01 16:56:01 -07: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
5dbc1b979b
Merge "Revert^2 "Fix signing failure for split APKs"" into main am: 7575d3f967
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3204750
Change-Id: Ib6dc29beb720575c55a4bd4eb39f24129d03f027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 16:19:04 +00: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
6a134d85dc
Merge "Added a basic prober script to test code completion." into main am: 80a07d6870
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3184559
Change-Id: Ia8ef73d1f8e3757de3d4cf057ef9631d5189b7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 12:20:36 +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
c3b0167348
Merge "Revert "Fix signing failure for split APKs"" into main am: 8a3f6256fc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3203851
Change-Id: I34d192280b3d3761dcb587675533e8bd141f32b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 10:48:36 +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
c1fbe7acf3
Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main am: ff301aa3a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196133
Change-Id: Iaec2858232544463a0bbaf2ce7ce29717bef60d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 07:19:07 +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
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
57ff7bdd84
Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..." am: 774a6dbbe8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3201035
Change-Id: I43c6a91e611a4fb2bec9431714029cbdcee1716b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 00:05:07 +00:00
Inseob Kim
37b05bf09c
Revert^2 "Conditionally pass kernel version to build.prop" am: b186331478
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3201034
Change-Id: I1c93023d7d4ed234a6d42588f0b9d874c015ded0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 00:05:05 +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