Liana Kazanova
d23cef7401
Revert "Revert "Revert "Revert^2 "Add more variables for system/..." am: dd3d5c1f3d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200276
Change-Id: Ic1e255edea95c79f470f9ffc2460b1fe04dec4d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 23:50:59 +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
Ryan Prichard
4297f90db2
Merge "Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."" into main am: 7428bc438d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198752
Change-Id: Ic9d5288cc43a10300fdcd23fe112530a03ad97ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 21:54:22 +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
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
Luca Farsi
269df0f5e2
Merge "Properly log in build_test_suites.py" into main am: b67ff3e17e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3191412
Change-Id: Ice158434720c408e8ed72d67d6bb26f063e7a118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 18:50:44 +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
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
f81b3e3f7c
Revert "Revert "Revert^2 "Add more variables for system/build.pr..." am: aaf50f6a43
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196510
Change-Id: I4c9832cf04226e6c0aa33cfb544c70dc2a805ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:13:43 +00:00
Inseob Kim
011c4c96ba
Merge "Conditionally pass kernel version to build.prop" into main am: fa8586c3bb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196470
Change-Id: I2b82331b4cb0e90902a4f70fd46514df24d5776d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:13:38 +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
Inseob Kim
fa8586c3bb
Merge "Conditionally pass kernel version to build.prop" into main
2024-07-30 03:51:03 +00:00
Ryan Prichard
6699bee8b9
Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."
...
Revert submission 3198506-revert-3195358-ndk-libcxx-UOZAIZERUU
Reason for revert: reland topic
Reverted changes: /q/submissionid:3198506-revert-3195358-ndk-libcxx-UOZAIZERUU
Bug: http://b/332594828
Test: treehugger
Change-Id: I36c9f825cccd02fdd5fc1cd67e5123fc9f84f6b1
2024-07-30 02:06:59 +00:00
Liana Kazanova
561c3c30b3
Merge "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"" into main am: 0a7e037a9a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198504
Change-Id: Idb1b917715d2732867e1c3f5ce0c56475680390a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 23:27:23 +00:00
Liana Kazanova
0a7e037a9a
Merge "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"" into main
2024-07-29 23:05:00 +00:00
Liana Kazanova
27cd53422f
Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"
...
Revert submission 3195358-ndk-libcxx
Reason for revert: Droidmonitor created revert due to b/356220894. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:3195358-ndk-libcxx
Change-Id: If4bac6cca12a4c70bab22ffd310f262ef6f5fb78
2024-07-29 22:58:44 +00:00
Ryan Prichard
131f0df720
Merge "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang" into main am: 56c607b139
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196993
Change-Id: Icc9665b75a345e2c04c6316890883f8743e6afba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 20:59:07 +00:00
Ryan Prichard
56c607b139
Merge "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang" into main
2024-07-29 20:46:39 +00:00
Zhi Dou
272a5a37b8
Merge "read new stoarge based on flag value" into main am: 5228a6f4a2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3194636
Change-Id: I4e18affd02bda662c7b35c04696cd462c7fb7e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 13:55:00 +00:00
Treehugger Robot
e4ba11c98d
Merge "use smart pointer for fd" into main am: 78decbf865
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195552
Change-Id: I2456f7cae1669c634804b73bc78a152d3df6d880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 13:54:43 +00:00
Zhi Dou
5228a6f4a2
Merge "read new stoarge based on flag value" into main
2024-07-29 13:26:35 +00:00
Treehugger Robot
78decbf865
Merge "use smart pointer for fd" into main
2024-07-29 13:15:15 +00:00
Zhi Dou
66ff40c08a
read new stoarge based on flag value
...
This change changes the logic to read the flag value from new storage.
Before it check the existence of a file. Not it will directly check the
flag value from DeviceConfig.
Test: m and presubmit
Bug: 349874828
Change-Id: I4a360564a3b48564057eede9bd893899136b3221
2024-07-26 22:46:47 +00:00
Zhi Dou
8add8e0c9b
use smart pointer for fd
...
Test: presubmit
Bug: 348693143
Change-Id: Ibdb1e132a4840d0c3d82aa5f7546a0fc5f5f528b
2024-07-26 22:25:43 +00:00
Treehugger Robot
2ddbb7f226
Merge "core/Makefile: Drop the raw packed desktop image from build artifacts." into main am: e75610b4c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3197590
Change-Id: I7e059054047549f24521bd439510ff47cba41ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 20:11:09 +00:00
Treehugger Robot
e75610b4c7
Merge "core/Makefile: Drop the raw packed desktop image from build artifacts." into main
2024-07-26 19:51:11 +00:00
Alex Klein
50687c3f2d
core/Makefile: Drop the raw packed desktop image from build artifacts.
...
Drop the raw image now to avoid the extra storage usage/costs
before someone starts depending on it.
Bug: b:349581445
Test: None
Change-Id: I8a0ba12d7f00ebad3e85327b00e2f700028658b0
2024-07-26 18:56:24 +00:00
Zhi Dou
e33e91c85c
Merge "add sdk none version for core lib usage" into main am: 8c6ec5a33d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3197450
Change-Id: I8e793418263fa35a94a30f14f922a3c0b5e6ee4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 15:51:35 +00:00
Zhi Dou
8c6ec5a33d
Merge "add sdk none version for core lib usage" into main
2024-07-26 15:33:22 +00:00
Zhi Dou
0e5e128034
add sdk none version for core lib usage
...
Test: m
Bug: 349874828
Change-Id: I412bcf06ca38c862b026715a6a394350eda49b64
2024-07-26 14:03:50 +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
Treehugger Robot
e110c68023
Merge "Add HOST_PREFER_32_BIT to Soong Config and move art-tools to product configuration." into main
2024-07-26 06:42:16 +00:00
Ryan Prichard
bc61b3ded6
Switch NDK libc++ from prebuilts/ndk to prebuilts/clang
...
prebuilts/ndk is still used for the `system` STL.
Bug: http://b/332594828
Test: treehugger
Change-Id: I24db1b93e55745aa1e0ef5fe7899985adfa6223a
2024-07-25 21:58:24 -07: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
Wei Li
61f3fbd2c2
Merge "Add new SBOM generation tool." into main am: 31964df630
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2956675
Change-Id: I822b077f08a3dbf7bae20f9e1e438fceba51b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 00:59:56 +00:00
Wei Li
31964df630
Merge "Add new SBOM generation tool." into main
2024-07-26 00:45:43 +00:00
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