Treehugger Robot
6dcf429d8f
Merge "[config] Boards can supply custom super image script"
2023-03-20 17:52:41 +00:00
Ziwei Zhang
0a25e67404
Merge "Add python mobly test template xml."
2023-03-20 02:16:04 +00:00
Aidan Wolter
fbf53522cf
[config] Boards can supply custom super image script
...
Some boards may need to customize the format of the super image. We will
now provide the variable BOARD_CUSTOM_BUILD_SUPER_IMAGE so that boards
can provide their own script for constructing the super image. This
mimics similar code in the same file for allowing boards to supply a
custom VBMeta (BOARD_CUSTOM_AVBTOOL) or boot image
(BOARD_CUSTOM_MKBOOTIMG).
Bug: None
Change-Id: I461caeb6dfb705fd5c671228fc35561ed403a1cb
2023-03-17 20:17:35 +00:00
Treehugger Robot
7a40e97d74
Merge "Rename rbcrun/cmd to make go install
work properly"
2023-03-16 20:26:22 +00:00
Treehugger Robot
d2b9ad4eb4
Merge "Disable riscv64 dependency on bcc and ld.mc"
2023-03-16 19:39:00 +00:00
Wei Li
4e824bc8e8
Merge "Clean up the strings and use f-strings instead of string.format()."
2023-03-16 04:02:09 +00:00
Dan Willemsen
ec5e3b8d28
Rename rbcrun/cmd to make go install
work properly
...
The standard go tooling assumes that a package's binary name should be
the name of the containing folder. Before this change, `go install` or
`go build` (without `-o`) names this binary `cmd`.
Also run `go mod tidy` while we're here, so the tooling doesn't try to
download github.com/nbutton23/zxcvbn-go, which we don't have a local
copy of.
Test: treehugger
Change-Id: I8f79724e928720caf961cdad128655ef31c3e9b2
2023-03-15 20:06:59 -04:00
Wei Li
155377c1d6
Clean up the strings and use f-strings instead of string.format().
...
Bug: 272356600
Test: m sbom
Change-Id: Ifc399bacf25850b896ecb003703b7637a98c8907
2023-03-15 14:07:41 -07:00
Treehugger Robot
4fac9d776c
Merge "Add an automated tools for generating brick OTA package"
2023-03-15 09:24:40 +00:00
Wei Li
15187b6f1a
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory."
2023-03-15 05:20:44 +00:00
Kelvin Zhang
f91d74bd52
Add an automated tools for generating brick OTA package
...
In the past, we have been generating brick OTA packages manually.
Automate this process.
Bug: 273561331
Test: create_brick_ota --product oriole brick.zip and apply the package
Change-Id: I7f4cf3cacaedd9d376b4cc07cbb388930bca643b
2023-03-14 16:58:36 -07:00
Wei Li
499333616c
Generate SBOM of the target product in file sbom.spdx.json in product out directory.
...
Original aosp/2374663 was reverted, so this change cnotains the implementation but disabled by default and SBOM will not be built by default with "m dist".
The feature will be enabled later in small CLs after running tests successfully in forrest.
Test: m sbom
Test: m dist
Test: on aosp, lunch aosp_bluejay-userdebug && m dist
Bug: 266726655
Change-Id: I926d0f97f3a0330ef61d059f12ea660005d370e6
2023-03-14 15:14:06 -07:00
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
Xin Li
48ba26b496
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I20a857714f506097c06cf8168b7ec368a3117612
Change-Id: Ib561d8940f172dae085b9b6e9010ecdaba83a661
2023-03-13 23:09:04 -07: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
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
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
Jooyung Han
580af1bab9
Merge "Remove the old output of conv_linker_config"
2023-03-10 02:13:49 +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
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
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
Rob Seymour
9492da59e3
Add test cases for APEX VINTF.
...
Add test cases to cover HAL definition found in embedded APEX.
Bug: 249086047
Test: releasetools_test
Change-Id: I5639b9b800a89164317740f64306ae10bf41343e
2023-03-09 17:00:06 +00: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
Treehugger Robot
75b9affb1a
Merge changes I674ad741,I908043ba am: cee4ebf1c3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2476065
Change-Id: Ie9625b4ef8b213bb5b95b286fd13539f3ff1376c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:12:07 +00:00