Commit Graph

99868 Commits

Author SHA1 Message Date
Treehugger Robot
287ec55da0 Merge "make aconfig_storage_file.test.java use library from framework" into main am: afede373c0
Original change: https://android-review.googlesource.com/c/platform/build/+/3194522

Change-Id: I68b7842830db8b8e33ec4297643e95af69d1ee51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-26 00:22:14 +00:00
Treehugger Robot
afede373c0 Merge "make aconfig_storage_file.test.java use library from framework" into main 2024-07-25 23:50:06 +00:00
Treehugger Robot
7d2bc4a31b Merge "core/Makefile: Add dist-for-goals calls for desktop image." into main am: 2837b5ec07
Original change: https://android-review.googlesource.com/c/platform/build/+/3191426

Change-Id: I5248fc5d0153a6606e39c5c03473fad7b2fb0976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 21:52:11 +00:00
Treehugger Robot
2837b5ec07 Merge "core/Makefile: Add dist-for-goals calls for desktop image." into main 2024-07-25 21:30:01 +00:00
Zhi Dou
d6b37c1be7 make aconfig_storage_file.test.java use library from framework
Test: atest aconfig_storage_file.test.java
Bug: 349874828
Change-Id: If6fbf086e889a2c0068a1ca22979db39f5d86448
2024-07-25 19:30:13 +00:00
Treehugger Robot
addcc154ad Merge "add hide and unsupportedadppusage annotation to read library" into main am: 33e9bc04c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3194521

Change-Id: Ie73f9ee1c657ab4f6dba44d2d3dfa4f6c6f47867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-25 18:56:21 +00:00
Treehugger Robot
33e9bc04c2 Merge "add hide and unsupportedadppusage annotation to read library" into main 2024-07-25 18:14:05 +00:00
Alex Klein
54b93ca0f0 core/Makefile: Add dist-for-goals calls for desktop image.
The desktop image is being built but not appearing in the artifacts.
Add dist-for-goals calls to make them show up in the builder
artifact lists.

Bug: b:349581445
Test: m, manual
Flag: EXEMPT desktop-only tooling
Change-Id: I015dc28871173376c1877e368ea423c9991e1aaf
2024-07-25 17:33:15 +00:00
Zhi Dou
fa988f0a34 add hide and unsupportedadppusage annotation to read library
Test: presubmit
Bug: 349874828
Change-Id: I5b808d87fe7df2ba8a85c8c75ee7baa66ff22d6b
2024-07-25 16:56:48 +00:00
Inseob Kim
aaf50f6a43 Revert "Revert "Revert^2 "Add more variables for system/build.pr..."
Revert submission 3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ

Reason for revert: fixed with aosp/3196490 and aosp/3196470

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

Change-Id: Id2da52a73f9791b3049c3fe60727bfb383180f14
2024-07-25 10:58:33 +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
Inseob Kim
5287eef8ad Conditionally pass kernel version to build.prop
This is to replicate Makefile's behavior as-is.

Bug: 322090587
Test: build and compare build command
Change-Id: Ide93a5acfdc30b6a97aebf26c9840fa54fcc6b87
2024-07-25 19:55:35 +09:00
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
Inseob Kim
409209f02c Merge changes from topic "revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ" into main
* changes:
  Revert "Revert^2 "Add more variables for system/build.prop migra..."
  Revert^3 "Use Soong-built system/build.prop"
2024-07-25 10:18:06 +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
49c151a2ea Merge changes from topic "revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR" into main
* changes:
  Revert^2 "Use Soong-built system/build.prop"
  Revert^2 "Add more variables for system/build.prop migration"
2024-07-25 07:27:59 +00:00
Wei Li
a3265ef0a1 Add new SBOM generation tool.
Bug: 324465531
Test: CIs
Test: m soong-sbom
Change-Id: Icfb7a9062158853b85c2de95f678ab164fc3fd90
2024-07-24 22:32:38 -07:00
Android Build Coastguard Worker
153d62e5d8 Version bump to AP3A.240905.001 [core/build_id.mk]
Change-Id: I5cf032164ee3086c6e79342fe4a89b1c013ee9fe
2024-07-25 04:17:42 +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
Luca Farsi
2eaa5d0bb0 Properly log in build_test_suites.py
Set up logging properly in build_test_suites.py so that the log file is
directed to the dist dir (and /tmp if it is not defined)

Test: atest build_test_suites_test
Bug: 355074139
Change-Id: I16ce644f1c717179377c8ca68c74d9af5f2e61df
2024-07-24 15:12:55 -07: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
Android Build Coastguard Worker
e8084fda12 Version bump to AP3A.240617.040 [core/build_id.mk]
Change-Id: I8a9a62a98ad8e9e6505983eced93042b7d986bf8
2024-07-24 04:07:04 +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
Android Build Coastguard Worker
14fda11f19 Version bump to AP3A.240617.039 [core/build_id.mk]
Change-Id: I1cdc717fea259251ede25171172fa406fac7e85d
2024-07-24 01:41:25 +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
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
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
e9c33abf2f 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: I29376e9b575a7c6d7144fe7862bd628da299f21e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-23 09:01:26 +00:00
Automerger Merge Worker
f650dbab88 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 2024-07-23 08:54:19 +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
Automerger Merge Worker
bee2154347 Merge "Merge "Exclude mcts tests from cts based on the env config." into android13-tests-dev am: b4a761670b" into android14-tests-dev 2024-07-23 08:36:19 +00:00