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
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
Wei Li
6f57b6d309
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3
am: edd91aa259
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755
Change-Id: I28f794c3a1686de5bc2fe56cb003dd2a3618cbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:28:40 +00:00
Cole Faust
21f795206c
Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107
am: 474f5f2742
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539
Change-Id: I3ddf464fe4bdf49fbfe0c3d81a9aaa882985a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:28:19 +00:00
Cole Faust
cef47562bb
Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef
am: ce3615c9e3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473
Change-Id: I05805331aad4a13084c67b8305233305336a300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:27:58 +00:00
Wei Li
edd91aa259
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: 82308a21a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481755
Change-Id: I868b8af6c1086473712073c33dd529129e4cc955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:04:33 +00:00
Cole Faust
474f5f2742
Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539
Change-Id: I106a75087660ace09f0ae658d1d2fc9893795fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:04:02 +00:00
Cole Faust
ce3615c9e3
Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473
Change-Id: Ifdb261e2f296b89743aa50a5a7c9073028006c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 07:03:35 +00:00
Wei Li
82308a21a3
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in...""
2023-03-10 06:40:54 +00:00
Cole Faust
cd70c8d107
Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES"
2023-03-10 06:37:24 +00:00
Cole Faust
c3eb995eef
Merge "Don't install jni libs for uninstallable modules"
2023-03-10 06:36:03 +00:00
Android Culprit Assistant
95c3ea8704
Revert "Generate SBOM of the target product in file sbom.spdx in..."
...
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a ).
Change-Id: I4c7d7645ec0c266eb4d591b3089ba02e78da0659
2023-03-10 06:18:03 +00:00
Wei Li
ae780fd76e
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b
am: 0939a08e0c
am: cfd8bb8d8d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663
Change-Id: I8b023cecc0929ab6e2706169a64c115896cedaec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 05:50:58 +00:00
Wei Li
cfd8bb8d8d
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b
am: 0939a08e0c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663
Change-Id: I9a6a9bbf24eb3a70d47220fa80c3d5caabf8c163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 05:22:44 +00:00
Wei Li
0939a08e0c
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663
Change-Id: Id1de64f1e6f73184ee8d0b84b32b643557e2e004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 04:59:41 +00:00
Wei Li
4e2aed055b
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory."
2023-03-10 04:47:47 +00:00
Jooyung Han
97d8898ea5
Merge "Remove the old output of conv_linker_config" am: 580af1bab9
am: 774c439bd8
am: 864e5b9a2c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575
Change-Id: I1fd516b91202adc2fa6aa1625a43ae4ae23e41f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 03:24:35 +00:00
Jooyung Han
864e5b9a2c
Merge "Remove the old output of conv_linker_config" am: 580af1bab9
am: 774c439bd8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575
Change-Id: I23855e8f7e11951e98e97bb195cf8304faa134fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 03:02:40 +00:00
Jooyung Han
774c439bd8
Merge "Remove the old output of conv_linker_config" am: 580af1bab9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575
Change-Id: Ice95d80620a66221e373b2ec4b476700fedba51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 02:41:31 +00:00
Wei Li
02797aa70e
Generate SBOM of the target product in file sbom.spdx in product out directory.
...
Test: m sbom
Test: m dist
Bug: 266726655
Change-Id: I6464fa2dc416dea62c5cf688c923d6b496f044f5
2023-03-09 15:27:58 -08:00
Presubmit Automerger Backend
fddbfae052
[automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I60b254a6fcfff396b88c80c58a17037817bb5bb7
2023-03-09 23:13:53 +00:00
Android Build Coastguard Worker
801827969c
Version bump to TQ2A.230405.003 [core/build_id.mk]
...
Change-Id: Ied48cfb3e60f8dcf2310ca071b509e551a68a11f
2023-03-09 19:58:20 +00:00
Cole Faust
189905be98
Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES
...
See other cl in this topic for more details.
Bug: 203436762
Test: m nothing
Change-Id: I76725afece50a022aec611091ef4dead5ad3449a
2023-03-09 11:55:29 -08:00
Jooyung Han
49bf691c65
Remove the old output of conv_linker_config
...
With 3397b6a2aadf8c2eb808fa38f7d6c07d5c82f320 in build/soong,
conv_linker_config fails when the output exists.
For system/vendor partitions, linker.config.pb files are built by
a custom rule, which is missing the removal of the old output. It would
fail with incremental build.
We could fix this by adding --force to overwrite. But I just added `rm`
following the convention in Makefile.
Bug: n/a
Test: m && (touch input of /vendor/etc/linker.config.pb)
m (again)
Change-Id: Iaeaf861e90b9535394d94c6b16229a4f566789d5
2023-03-09 16:47:32 +09:00
Ziwei Zhang
75a5f1ad10
Add python mobly test template xml.
...
Test: manually check the generated mobly xml config
Bug: 272239365
Change-Id: I871f87f042e67f3fad582171010e5d0af8f3e64f
2023-03-09 08:40:02 +08:00
Dan Shi
7c2982ab87
Update art-host-tests build rule to support partial download
...
Bug: 272110734
Test: build
Change-Id: Icd13530a662e7989c6d8cb5c68b95857bdeb7182
2023-03-09 00:16:25 +00:00
Dennis Shen
03ef64b134
add make_erofs to otatools to support erofs apex
...
Change-Id: I272e7a689c563ac0a266e6cd86984fc85a3380b9
2023-03-08 23:49:30 +00:00
Julien Desprez
ca46df5783
Remove tradefed-no-fwk from suites
...
Test: presubmit
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
(cherry picked from commit 917acd67c7
)
2023-03-08 18:32:09 +00:00