Commit Graph

33811 Commits

Author SHA1 Message Date
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
Jooyung Han
74e8c32dba Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e am: 741d079d3c am: 3540f51a33
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I8e4d7d31f72f88d164d2010ddf946060c24c5992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 03:24:06 +00:00
Jooyung Han
3540f51a33 Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e am: 741d079d3c
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I402c0c51cde1d88369a8e3fbb66c490c4d0b06e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:47:31 +00:00
Jooyung Han
741d079d3c Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I3f8addf829fafda072aff26f3e9d63a1f5c09394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:11:51 +00:00
Jooyung Han
cd10355f3e Merge "Add dependency to /vendor/etc/linker.config.pb" 2023-03-08 01:34:23 +00:00
Evgenii Stepanov
e7fb9a9bcf Merge "Add armv9-a arch variant." am: e497e7dfba am: fd3a7181df am: cc0527f15e
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: Ifba76a2c7bea8f688db5c6c86709cee6f1a770db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 00:44:50 +00:00
Evgenii Stepanov
cc0527f15e Merge "Add armv9-a arch variant." am: e497e7dfba am: fd3a7181df
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: I8349bd70d179e88edd8db9f4d457f44f34c878b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 00:09:13 +00:00
Evgenii Stepanov
fd3a7181df Merge "Add armv9-a arch variant." am: e497e7dfba
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: If684ebdabe50db2c7c78692e861aab8717e5afc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:34:08 +00:00
Evgenii Stepanov
e497e7dfba Merge "Add armv9-a arch variant." 2023-03-07 22:58:10 +00:00
Treehugger Robot
83cc7e0e60 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6 am: cf0325c0c0 am: 218232234c
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I700ff0d0b37d77a4cc2567ccb60083e89ae18710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:33:40 +00:00
Jooyung Han
63975d73b1 Add dependency to /vendor/etc/linker.config.pb
The rule for the file should depend on vendor files. Otherwise, the rule
can be fired before installation of those stub libraries in /vendor/lib.

Bug: 244531518
Test: m (with a vendor lib with stubs)
Test: check /vendor/etc/linker.config.pb (should have the lib)
    $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb
Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967
2023-03-07 18:28:18 +09:00
Treehugger Robot
218232234c Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6 am: cf0325c0c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: Ib832bf7293b3c4f2d77949e7832b60452a80958b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:48:04 +00:00
Treehugger Robot
cf0325c0c0 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I0ba37422a26b7f3a51faee969eef14039690fe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:11:54 +00:00
Evgenii Stepanov
3148fe365b Add armv9-a arch variant.
Bug: b/263283855
Test: none
Change-Id: I0e9fd48305ad1a26a708ecb2f0d3e7a07e14dbc8
2023-03-05 14:38:12 -08:00
Jooyung Han
8c119032f4 Create vendor/etc/linker.config.pb with STUB_LIBRARIES
system/etc/linker.config.pb is automatically populated with
STUB_LIBRARIES. We do the same for vendor/etc/linker.config.pb.

Bug: 244531518
Test: m vendorimage
Change-Id: If930ca07fcf7c6830b70a0332dae05365b90db12
2023-03-04 08:32:34 +09:00
Roberto Gil Del Sol
eac3a2131f Merge changes from topic "ext-v6" into udc-dev
* changes:
  [automerge] Bump SDK Extension version to 6 2p: b3b72e8910
  Bump SDK Extension version to 6
2023-03-02 10:43:47 +00:00
Treehugger Robot
69cca6752e Merge "Can declare 1p without cycles." am: 04d5903f12 am: e26da42cf0 am: 8849fa52d4
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I177314d9e9f40b1899cb10c5eada5cff1b2b4fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:42:03 +00:00
Treehugger Robot
8849fa52d4 Merge "Can declare 1p without cycles." am: 04d5903f12 am: e26da42cf0
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I61afb68743395d7b3191df96a2041f14836f4bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:07:40 +00:00
Treehugger Robot
e26da42cf0 Merge "Can declare 1p without cycles." am: 04d5903f12
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I29ff0ebc7918705924020ef196830709b685e7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:31:31 +00:00
Treehugger Robot
1eb9f4fceb Merge changes I7266c0cc,I3caba054 am: c986b3ada3 am: 6e6fb8291f am: 931b1ea788
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: I66194dba5b13e655b2b2780a2cc1a11138a75a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 01:10:25 +00:00
Treehugger Robot
68654c7198 Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573 am: b7ee2672ec am: bbfc27134d
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: I3836a3f53de2323ba5f410cba0a37a16df58b773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 01:06:22 +00:00
Treehugger Robot
931b1ea788 Merge changes I7266c0cc,I3caba054 am: c986b3ada3 am: 6e6fb8291f
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: If811f90597118bad5fe7daf53093aae09d625419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 00:28:44 +00:00