Commit Graph

99729 Commits

Author SHA1 Message Date
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
Treehugger Robot
53d9852f35 Merge "Fix signing failure for split APKs" into main am: 787d933f87
Original change: https://android-review.googlesource.com/c/platform/build/+/3202232

Change-Id: Ia9832e2218b9b8518435d9c289512f337d6e93bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 21:10:02 +00:00
Treehugger Robot
787d933f87 Merge "Fix signing failure for split APKs" into main 2024-07-31 21:06:37 +00:00
Liana Kazanova
37614d801a Merge "Revert "Add variables for init.environ.rc"" into main am: d0b03dd868
Original change: https://android-review.googlesource.com/c/platform/build/+/3202811

Change-Id: I52b6ab657b4d45717cbb4def9928344f54feed09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 20:55:31 +00:00
Liana Kazanova
d0b03dd868 Merge "Revert "Add variables for init.environ.rc"" into main 2024-07-31 20:49:29 +00:00
Liana Kazanova
f2289bfdd2 Revert "Add variables for init.environ.rc"
Revert submission 3197177-init_environ_rc_soong

Reason for revert: DroidMonitor: Potential culprit for b/356587212 - 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:3197177-init_environ_rc_soong

Change-Id: I7cfe54a994179577a7f3e3f86618ff04980aaf35
2024-07-31 17:56:40 +00:00
Kelvin Zhang
6871779d9b Fix signing failure for split APKs
Test: th
Bug: 353837347
Change-Id: Ifed9746c1e1d053a97860de3bab4380d6e207412
2024-07-31 10:36:47 -07:00
Treehugger Robot
907656e003 Merge "Add variables for init.environ.rc" into main am: 44b3f9eb39
Original change: https://android-review.googlesource.com/c/platform/build/+/3198791

Change-Id: Ic3ddf58e1ba62f4cd31272012c0853454f89f842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-31 06:06:14 +00:00
Treehugger Robot
44b3f9eb39 Merge "Add variables for init.environ.rc" into main 2024-07-31 05:37:30 +00:00
Inseob Kim
774a6dbbe8 Revert "Revert "Revert "Revert "Revert^2 "Add more variables for..."
Revert submission 3200273-revert-3196490-revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA-PCKYAVELZP

Reason for revert: fixed breakage with aosp/3200730, verified with ABTD

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

Change-Id: I19163de97c397b9c171362d221389a1d66a5712a
2024-07-31 02:00:41 +00:00
Inseob Kim
b186331478 Revert^2 "Conditionally pass kernel version to build.prop"
ff77e22213

Change-Id: I846175bb9dc2b0e000fc39c7faf2e24167b4a513
2024-07-31 02:00:41 +00:00
Inseob Kim
b97c96b4b3 Revert^6 "Use Soong-built system/build.prop"
0b2f48f0b2

Change-Id: I5d89d26945a3ab94f102633ccffa7622b5f99469
2024-07-31 02:00:41 +00:00
Spandan Das
99419d2e06 Move the installation rules of device boot images to soong
This CL adds moves the installation rules of boot images to soong. This
will eventually allow us to build devices by skipping `katiBuild` and
moving straight to `katiPackaging`

Details
1. Drop `dex_preopt_libart.mk` calls for device boot images. This was
   previously generating the copy rules of soong built artifacts into
the installation directory in $PRODUCT_OUT. The installation rules will
now be generated by soong's dex_bootjars singleton
2. Drop the profile files of `DEXPREOPT_IMAGE_PROFILE_BUILT_INSTALLED`
   from the `ALL_DEFAULT_INSTALLED_MODULES`. This will be installed by
dex_bootjars singleton as well.
3. Replace the REQUIRED property in reverse dependencies with
   `dex_bootjars`. By adding this singleton to required, we ensure that
the boot images get installed on device.

This CL does not change the behavior for installation rules of host boot
images. (Those will be tracked in b/355706080)

Test: no diff in
target/product/vsoc_x86_64/obj/PACKAGING/system_intermediates/file_list.txt
(top of stack)
Bug: 355700341
Bug: 355703904

Change-Id: Id854feead08df6c2fcbb6175860f76378fc5af5f
2024-07-31 00:21:25 +00:00
Zhi Dou
5a464e039d Merge "aconfig: make java cached indicator volatile" into main am: 3d960c5638
Original change: https://android-review.googlesource.com/c/platform/build/+/3199672

Change-Id: I476b8e6ee613342e6a03b85771bc3aaebb98ef9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:45 +00:00
Zhi Dou
f409df4939 Merge "close file stream" into main am: 39020e05c6
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474

Change-Id: I8c40d1a77546c28e1ece9f5ae45e29ce6eb1a034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:32 +00:00
Inseob Kim
7ad308a3e7 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 am: aac9b8d04f
Original change: https://android-review.googlesource.com/c/platform/build/+/3200277

Change-Id: Ie37f5786614d47bb9968292d9fa2a71c086eaea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-30 23:51:02 +00:00
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
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
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
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
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