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
Ziwei Zhang
11840e42bd
RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS.
...
Test: presubmit
Bug: 348121714
Change-Id: Ia5fc4bbc994f71e61c9030cd6fb8bdb382a65b0f
2024-07-29 11:28:39 +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
Android Build Coastguard Worker
98a6e97fb8
Version bump to AP3A.240905.003 [core/build_id.mk]
...
Change-Id: I88fad93d3ead7ebefdc863a69ad190ddf8033f84
2024-07-26 22:08:00 +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
Nelson Li
bdab1b5329
Add art_build_host_debug to soong config variable
...
The `ART_BUILD_HOST_DEBUG` 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.
Bug: 347142939
Test: 1) m -j art-libartd-libopenjdkd-host-dependency
2) ART_BUILD_HOST_DEBUG=false m -j art-libartd-libopenjdkd-host-dependency
3) cd art && mm/mmm/mmma, then, check `libopenjdkd` be built.
Change-Id: I20401f29a1636b98dd8fc2dc4e679d1832a89435
2024-07-26 15:28:46 +08: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
Herbert Xue
973d57ce67
Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk
...
Bug: 348120216
Test: presubmit
Change-Id: Iad21acbbc29c84181646bdafbdb3069a863a098a
2024-07-26 11:21:03 +08:00
Android Build Coastguard Worker
74afd0a2f9
Version bump to AP3A.240905.002 [core/build_id.mk]
...
Change-Id: I2e7e5e51c05321e6412e2d72643bd21db91f3590
2024-07-26 02:19:10 +00: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
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