Steve Berbary
2c4dad8ca3
Update Security String to 2023-05-01 am: 6a3344db86
am: eaaa30b619
am: 07c703d53d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:23:46 +00:00
Jiakai Zhang
f109ea74c7
Turn on ART Service.
...
Bug: 272053358
Test: Presubmit
Change-Id: Ief92fd8bc759e674c7fb2fcec71233c0f3c88946
Ignore-AOSP-First: ART Service is a new feature only in internal.
2023-03-14 17:45:53 +00:00
Steve Berbary
07c703d53d
Update Security String to 2023-05-01 am: 6a3344db86
am: eaaa30b619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:44:19 +00:00
Treehugger Robot
c189bbce54
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
am: f63e3bcc68
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:28:11 +00:00
Steve Berbary
eaaa30b619
Update Security String to 2023-05-01 am: 6a3344db86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029
Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:09:15 +00:00
Treehugger Robot
f63e3bcc68
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6
Merge "add make_erofs to otatools to support erofs apex"
2023-03-14 15:47:05 +00:00
Steve Berbary
48e2c20515
[automerger skipped] Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
am: 877ca9f537
-s ours am: 53afb275c6
-s ours am: a8cb65919d
-s ours
...
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: Icc21d31ec90cdb452213d06b9f5a550e9c11cc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 06:33:31 +00:00
Xin Li
48ba26b496
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I20a857714f506097c06cf8168b7ec368a3117612
Change-Id: Ib561d8940f172dae085b9b6e9010ecdaba83a661
2023-03-13 23:09:04 -07:00
Steve Berbary
a8cb65919d
[automerger skipped] Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
am: 877ca9f537
-s ours am: 53afb275c6
-s ours
...
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: Id94216fb6b7b1e2ee12b6e785365a3b43247f719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 05:58:05 +00:00
Steve Berbary
53afb275c6
[automerger skipped] Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
am: 877ca9f537
-s ours
...
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: Ia061e9f9d2e67a0f5615bc6249575e49f38f8be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 05:24:56 +00:00
Steve Berbary
b761628288
[automerger skipped] Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
am: fa8a0ea9ef
-s ours
...
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 be772485c3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: Iafc9e622bc5558fa9d6e8867db5a777126a971d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 05:22:34 +00:00
Steve Berbary
fa8a0ea9ef
Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: I0428ed3835e0c0f151569654133ae406ab5f3c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 04:38:34 +00:00
Steve Berbary
877ca9f537
Update Security String to 2023-05-01 am: 2130534b73
am: 24272b1f7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e
Update Security String to 2023-05-01 am: 2130534b73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115
Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 03:50:29 +00:00
Steve Berbary
72e9b8675e
Update Security String to 2023-05-05 am: be772485c3
am: 072f723276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 01:58:16 +00:00
Steve Berbary
072f723276
Update Security String to 2023-05-05 am: be772485c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 01:17:35 +00:00
Kevin Han
21f3289c94
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
am: a27f3cef8b
am: db4eccb0b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: I59fe77902d69477667e0f6165549a58297c59f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 22:56:18 +00:00
Kevin Han
db4eccb0b2
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
am: a27f3cef8b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: Icda5099833a520be40518aad9fd61d962e4e0707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 22:03:01 +00:00
Kevin Han
a27f3cef8b
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: I6a2405ac28898643a070616d7da3d5f49df9a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 21:28:45 +00:00
Kevin Han
afb2495f6f
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in...""
2023-03-13 21:03:22 +00:00
Kevin Han
161d711d4d
Revert "Generate SBOM of the target product in file sbom.spdx in..."
...
Revert submission 2481062-sbom
Reason for revert: b/273332655
Reverted changes: /q/submissionid:2481062-sbom
Change-Id: Ie8a73d8dc50592204acd489482e0e9d96ffbd5df
2023-03-13 20:57:37 +00:00
Treehugger Robot
20d6e731bb
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
am: 50aeb8e735
am: 21eadd9e7a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: Ifd807dbccb3346b79b6b69d2c02478121f25f8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 20:02:16 +00:00
Wei Li
d6fba2a779
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957
am: 1f2ba11661
am: 4534fbc056
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062
Change-Id: Ida57382107218ac24e4465dd10888eec738d364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 20:00:19 +00:00
Treehugger Robot
21eadd9e7a
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
am: 50aeb8e735
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 19:07:09 +00:00
Wei Li
4534fbc056
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957
am: 1f2ba11661
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062
Change-Id: Ied7c1b2f563a957ba73b7d076311caf22db80853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 19:06:00 +00:00
Treehugger Robot
50aeb8e735
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: I2a6d4a7a9018fbbd580088ed16efc6c8cee80c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 18:35:20 +00:00
Wei Li
1f2ba11661
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062
Change-Id: I3410bc5aef8a08df8c707733d4f2addd61087868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 18:33:30 +00:00
Treehugger Robot
909a5b40a6
Merge "Update art-host-tests build rule to support partial download"
2023-03-13 17:54:01 +00:00
Roberto Gil Del Sol
26aa1b5efb
Revert "Bump SDK Extension version to 6" am: 44f6963cb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21982904
Change-Id: I02015578609fa3bc3f3a59670a84ded97acc98da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 17:53:31 +00:00
Wei Li
27d32b0957
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory."
2023-03-13 17:43:59 +00:00
Wei Li
88ac7ae7df
Generate SBOM of the target product in file sbom.spdx in product out directory.
...
Original aosp/2374663 was reverted, try to submit it again with some fixes in this.
Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: Icf305770473f0c448a1ad721cbe7addf737115e4
2023-03-13 17:38:04 +00:00
Roberto Gil Del Sol
44f6963cb0
Revert "Bump SDK Extension version to 6"
...
This reverts commit b3b72e8910
.
Reason for revert: Due to lack of testing extServices needs to deboard M-05 train and sdk finalization needs to be reverted
Change-Id: I278a499b5c30f13617c134ce27a43a8ffa32e099
2023-03-13 08:33:02 +00:00
Cole Faust
c35935c344
Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5
am: dc6b660798
am: 25b05a358a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535
Change-Id: Id46c411a3af6739e88c8b04104b91a2c054dcc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 03:02:16 +00:00
Steve Berbary
6a3344db86
Update Security String to 2023-05-01
...
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:52:03 +00:00
Steve Berbary
2130534b73
Update Security String to 2023-05-01
...
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:50:50 +00:00
Steve Berbary
be772485c3
Update Security String to 2023-05-05
...
Bug: 272844037
Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
2023-03-11 02:47:39 +00:00
Cole Faust
25b05a358a
Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5
am: dc6b660798
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535
Change-Id: I22ecf4fe4b04e75c69777e5792acfbefbfaa14c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 01:53:44 +00:00
Cole Faust
dc6b660798
Merge "Don't install jni libs for uninstallable modules" am: 627fa73df5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2482535
Change-Id: I888ca82ce426ce147d44341ea1137dafe904de8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 01:13:01 +00:00
Cole Faust
627fa73df5
Merge "Don't install jni libs for uninstallable modules"
2023-03-11 00:28:35 +00:00
Cole Faust
a5511ea91a
Don't install jni libs for uninstallable modules
...
Bug: 254205429
Test: Presubmits
Change-Id: I6eec24f17bfeac0179558356e07a13dfb071a2bb
2023-03-10 12:30:12 -08:00
Iván Budnik
e89ee37806
Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab
am: 4b17107fe3
am: 9e3c1085a5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060
Change-Id: I8c6ad275ea706add5244821f5849252cef7f59ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 18:17:23 +00:00
Iván Budnik
9e3c1085a5
Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab
am: 4b17107fe3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060
Change-Id: I7b6fda015713093840a1d567f2b196620aab6cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 17:23:18 +00:00
Iván Budnik
4b17107fe3
Merge "Revert "Don't install jni libs for uninstallable modules"" am: 1c117c5fab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481060
Change-Id: I181241288de1c5e261f01c8acee1ea7cd179fd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 16:47:30 +00:00
Iván Budnik
1c117c5fab
Merge "Revert "Don't install jni libs for uninstallable modules""
2023-03-10 16:30:32 +00:00
Iván Budnik
4616ec7eb7
Revert "Don't install jni libs for uninstallable modules"
...
Revert submission 2462194-androidmk_for_apex_dependencies
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508 , bug b/272663333.
Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies
Bug: 272663333
Change-Id: Iecf99713133b2bc8f35614b6b9596422dc051198
2023-03-10 16:11:31 +00:00
Wei Li
3ce3f29f3d
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3
am: edd91aa259
am: 6f57b6d309
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755
Change-Id: I24bb03108b69c00fe3c494b26ceccf34006c8411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:48:50 +00:00
Cole Faust
f6476d2794
Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107
am: 474f5f2742
am: 21f795206c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539
Change-Id: Id3ea7da13d7353a3c451aba770cdb583ae2a70a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:48:31 +00:00
Cole Faust
e74e2aed2a
Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef
am: ce3615c9e3
am: cef47562bb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473
Change-Id: Idc926346cbccd35b7550334e2ce19d7b532394c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:48:13 +00:00