Commit Graph

86717 Commits

Author SHA1 Message Date
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
Android Build Coastguard Worker
aa9f7f727f Make change and version bump to UP1A.230313.001
Snap for 9731922 from c35935c344 to udc-release

Change-Id: I3f8be453fa32c076f834ad5a8e689280ff76f313
2023-03-13 00:08:28 +00:00
Android Build Coastguard Worker
1ff686c9d9 Make change and version bump to UP1A.230312.001
Snap for 9730513 from c35935c344 to udc-release

Change-Id: I273d6f1c0a6e663fca193248e1acb02669fae5f6
2023-03-12 04:18:07 +00:00
Android Build Coastguard Worker
1565a72545 Make change and version bump to UP1A.230311.001
Snap for 9728260 from e89ee37806 to udc-release

Change-Id: I01f188783fcd99791d29cb8a09418526c078fb2f
2023-03-11 05:16:13 +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
Android Build Coastguard Worker
a235a6518c Version bump to UP1A.230310.003 [core/build_id.mk]
Change-Id: Id166797546d3c4e4cdc0aa03c76ab15d6a4b3313
2023-03-10 22:31:41 +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
Android Build Coastguard Worker
e2f06d5a0f Version bump to UP1A.230310.002 [core/build_id.mk]
Change-Id: Icb999910e30651dc3af78c3a54574beeb2800a6a
2023-03-10 04:05:27 +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
Android Build Coastguard Worker
f040a299c8 Make change and version bump to UP1A.230310.001
Snap for 9719949 from e3bfab3f9f to udc-release

Change-Id: Id5c0d00fd4749b0ea992aa8df2a8e265cee833ea
2023-03-10 03:13:10 +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
Rob Seymour
42c7f1c43a Merge "Add test cases for APEX VINTF." am: 578e1bb073 am: 58d63254dc am: 9e52f880b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2242995

Change-Id: Ie5784e359609772a28c3b2b67401b179171c678f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:41:00 +00:00
Jooyung Han
580af1bab9 Merge "Remove the old output of conv_linker_config" 2023-03-10 02:13:49 +00:00
Rob Seymour
9e52f880b9 Merge "Add test cases for APEX VINTF." am: 578e1bb073 am: 58d63254dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2242995

Change-Id: Ibb3764a362c8b3ea38a9c5d6a8857615e4832166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 01:57:02 +00:00
Rob Seymour
58d63254dc Merge "Add test cases for APEX VINTF." am: 578e1bb073
Original change: https://android-review.googlesource.com/c/platform/build/+/2242995

Change-Id: I0613b84cdc1b9901da5e386409861c037679b6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 01:16:38 +00:00
Rob Seymour
578e1bb073 Merge "Add test cases for APEX VINTF." 2023-03-10 00:34:36 +00:00
Android Build Coastguard Worker
cbba796b37 Version bump to UP1A.230309.002 [core/build_id.mk]
Change-Id: I4e576c6f5a96ccc39b83c8bb2ca251691b64a9d3
2023-03-09 23:35:22 +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