Zhi Dou
b7f3c9e51e
Merge "close file stream" into main am: 39020e05c6
am: f409df4939
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3199474
Change-Id: Ie128a1ba09440ea08e1031caaa625d76999f68ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-31 00:06:11 +00:00
Inseob Kim
a8d2e1ced8
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
am: 7ad308a3e7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200277
Change-Id: Ieba4dcf7e54fdf7b63279561d4352be32d50cc2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-31 00:05:44 +00:00
Liana Kazanova
d0a62f74f1
Revert "Revert "Revert "Revert^2 "Add more variables for system/..." am: dd3d5c1f3d
am: d23cef7401
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200276
Change-Id: I9270b9388586259b0de826f59c4fc5d8c4eef31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-31 00:05:38 +00:00
Liana Kazanova
e4d9698efb
Revert^5 "Use Soong-built system/build.prop" am: 0b2f48f0b2
am: 20187aadc1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3200275
Change-Id: Ia1a94355f14acd67c2e3a8876bba94d00a9d75c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-31 00:05:33 +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
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
a1c9347ce6
Merge "Revert "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilt..."" into main am: 7428bc438d
am: 4297f90db2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198752
Change-Id: I88dd6b0d9372f5086bf4a0d7fc479dfaf19a4d00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 22:11:53 +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
b6d75cb4a1
Merge "Properly log in build_test_suites.py" into main am: b67ff3e17e
am: 269df0f5e2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3191412
Change-Id: If07c1a6c3f48bacafc80f79028b8164308f779da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 19:01:15 +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
8f8de5d64c
Merge changes from topic "revert-3195812-revert-3195644-revert-3195637-revert-3184480-system_build_prop_soong-BZIDUTEOOC-KRUETCBWUR-TUHZPHUVFJ-XYILSUPUOA" into main am: e72dcd549a
am: 632a96d3ba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196511
Change-Id: I6fcf0b31dbd29b1cb5c13e60b93f98be8a68da13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:28:46 +00:00
Inseob Kim
9ef7a895b6
Revert "Revert "Revert^2 "Add more variables for system/build.pr..." am: aaf50f6a43
am: f81b3e3f7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196510
Change-Id: I82795c133be84ca856bf7421fcf8c83c0ba31f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:28:40 +00:00
Inseob Kim
4b0ffae225
Merge "Conditionally pass kernel version to build.prop" into main am: fa8586c3bb
am: 011c4c96ba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196470
Change-Id: I7eb62d6f172e87b39b2abf6b3796e997b6691ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-30 04:28:35 +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
7c6b2d42a0
Merge "Revert "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang"" into main am: 0a7e037a9a
am: 561c3c30b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198504
Change-Id: Ia0757f0d8c0254250f5cadf2c0e70f7cb86c4d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 23:43:48 +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
eeda5490fe
Merge "Switch NDK libc++ from prebuilts/ndk to prebuilts/clang" into main am: 56c607b139
am: 131f0df720
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196993
Change-Id: I3bbd4b6b89e183ef344bc22af34c0fb349dea2af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 21:35:13 +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
d7b41af5f6
Merge "read new stoarge based on flag value" into main am: 5228a6f4a2
am: 272a5a37b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3194636
Change-Id: I27141d3c51c84b1cdd647c0764f043b3920460aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 14:18:11 +00:00
Treehugger Robot
7b7d4c4ade
Merge "use smart pointer for fd" into main am: 78decbf865
am: e4ba11c98d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3195552
Change-Id: Ib2d9fe2b2ca18c31440727a500feea6b2cf0d923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-29 14:17:52 +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
Treehugger Robot
cbe0d0419f
Merge "Update vintf finalization script" into main
2024-07-27 03:22:34 +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
bef8523ff3
Merge "Don't read flag value file when storage disabled" into main
2024-07-26 20:59:36 +00:00
Treehugger Robot
e4e44b4891
Merge "core/Makefile: Drop the raw packed desktop image from build artifacts." into main am: e75610b4c7
am: 2ddbb7f226
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3197590
Change-Id: Ibd7e7560a8242d0fcf31ea93d225dc6ecd98febb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-26 20:24:05 +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
Ted Bauer
1aec18dd3e
Don't read flag value file when storage disabled
...
Test: m
Bug: 350980453
Change-Id: Ibdf75a8bb310e89f247a176fc5b0b9236af3705c
Ignore-AOSP-First: will CP to AOSP afterwards
2024-07-26 19:23:19 +00:00