Commit Graph

99868 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Sid Nayyar
161520fca4 Add kernel lifetimes and approved OGKI builds configs to GSI
These kernel configs are required for end-of-life enforcement and OGKI
compliance verification VTS tests.

Bug: 338636324
Bug: 342094847
Test: manually built and flashed on device, device had config files
(cherry picked from https://android-review.googlesource.com/q/commit:0123e4d62687683f6cfee115f1065af19869a239)
Merged-In: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
Change-Id: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
2024-07-30 13:45:52 +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
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
Android Build Coastguard Worker
d0f98a4f7b Version bump to AP3A.240905.004 [core/build_id.mk]
Change-Id: Ibd5ae0e7767d0ff1b33b8b957c8ae9ce01123880
2024-07-30 00:04:17 +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
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