Xin Li
eb2ad4b002
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:46 +00:00
Treehugger Robot
d4248892e6
Merge "add make_erofs to otatools to support erofs apex"
2023-03-14 15:47:05 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
6e6fb8291f
Merge changes I7266c0cc,I3caba054 am: c986b3ada3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633
Change-Id: I741ebdb2cb8f1f77e99e50d1026dbe507b0ff7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:53:52 +00:00
Treehugger Robot
b7ee2672ec
Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631
Change-Id: If539a9525ce219b9df192e6dba149db18bbbd67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 23:53:19 +00:00
Bob Badour
7aee59482b
Can declare 1p without cycles.
...
Test: m droid dist
Change-Id: I044f1832db36d685628faed569f87491a6789591
2023-03-01 15:51:24 -08:00
Bob Badour
df0f55e526
Assert copyright on log contents.
...
Test: m droid dist
Change-Id: I7266c0cc7c1517482e3aa66f8c7df3a6fbe484fe
2023-03-01 10:34:34 -08:00
Bob Badour
1d31e2d776
Assert copyright on comments in file.
...
Test: m droid dist
Change-Id: I3caba054f44e1dcc9896fd4121c3d6a1a5139158
2023-03-01 10:31:25 -08:00
Bob Badour
7cc4e334ca
BUILT_KERNEL_CONFIGS_FILE built by linux tools
...
Doesn't qualify as 0p. Use kernel license text.
Test: m droid dist
Change-Id: Ideb88128b3c0f250d4c978291a028b2952b73ba9
2023-03-01 10:16:04 -08:00
Cole Faust
a3763c18ef
Don't install jni libs for uninstallable modules
...
Bug: 254205429
Test: Presubmits
Change-Id: I6739b71ce4a0141ad39d4b6046ae63c4c12e367d
2023-02-28 18:10:23 -08:00
Joe Onorato
a29a46050a
Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830
Change-Id: I5e369235fae2ca61361873f95712dcb9d2d83570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 22:02:37 +00:00
Joe Onorato
10bdfb5f23
Merge "Remove OWNERS access for non-build team people to core build system"
2023-02-28 21:27:22 +00:00