Treehugger Robot
c39ca1406d
Merge "Remove vtsc host tool" am: 896e7c715e
am: d0362d7b16
am: 75c71733ef
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778
Change-Id: I2de4252e46022157e44773294fca721747307e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 04:57:11 +00:00
Treehugger Robot
75c71733ef
Merge "Remove vtsc host tool" am: 896e7c715e
am: d0362d7b16
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778
Change-Id: Ic52c0427a575f1c37f8f5b89c0209ac16b736012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 03:57:38 +00:00
Treehugger Robot
896e7c715e
Merge "Remove vtsc host tool"
2023-03-21 02:14:34 +00:00
Cole Faust
e08325fb55
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
am: bfbb7718c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: I66d57643ba132b420edf9725d9b4bd36457f692f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 21:52:52 +00:00
Treehugger Robot
3c79e80233
Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
am: 708b70a554
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575
Change-Id: I9479b1cc06bcd4d2abd5ac4009bfa92b4f24acfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 21:16:00 +00:00
Cole Faust
bfbb7718c7
Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
am: 299878fb17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212
Change-Id: Ie773663bd3cd5770af0e754ee29c9f411d574244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 21:14:47 +00:00
Treehugger Robot
5f3ddd4f41
Merge "Add rkpd to the list of individually toggleable modules"
2023-03-20 20:41:51 +00:00
Cole Faust
14108b6a57
Merge "Create image apexes by default instead of flattened apexes"
2023-03-20 19:54:49 +00:00
Treehugger Robot
76394be62a
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
am: 96a1cfe673
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: If650e824bbf7f7446e3c4b922dd8a471d3a8e543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 19:47:23 +00:00
Treehugger Robot
96a1cfe673
Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
am: d90bc8e5ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355
Change-Id: Ia41fb01d563745f2b13a95875273a5c0347ab7fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 19:02:32 +00:00
Cole Faust
5e2491eff2
Create image apexes by default instead of flattened apexes
...
This is a list of all the internal master products that
use flattened apexes before and after this commit:
https://diff.googleplex.com/#key=AcyUcqOwqpXZ
Apexes can still be flattened by setting `TARGET_FLATTEN_APEX := true`
or `OVERRIDE_TARGET_FLATTEN_APEX := true` in their product config.
Bug: 254205429
Test: presubmits
Change-Id: I5b15f0fc9e149730fd33722632a8ac14432ab757
2023-03-20 18:39:22 +00:00
Treehugger Robot
6dcf429d8f
Merge "[config] Boards can supply custom super image script"
2023-03-20 17:52:41 +00:00
Paul Duffin
a537224b3a
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Merged-In: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
(cherry picked from commit 95b546475f
)
2023-03-20 16:21:23 +00:00
Paul Duffin
d82796bbf8
Merge "Add rkpd to the list of individually toggleable modules" into udc-dev
2023-03-20 16:13:18 +00:00
Ziwei Zhang
34a9f9c13e
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
am: 31337205d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I8a7a54ca25114c61782aac8e7c4f6ea8597ff925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 04:08:05 +00:00
Ziwei Zhang
31337205d6
Merge "Add python mobly test template xml." am: 0a25e67404
am: 863bf01391
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502
Change-Id: I15452245b1a59125d5e40b6fa1d3bd81090da4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 03:28:46 +00:00
Ziwei Zhang
0a25e67404
Merge "Add python mobly test template xml."
2023-03-20 02:16:04 +00:00
Paul Duffin
95b546475f
Add rkpd to the list of individually toggleable modules
...
This is needed because the rkpd module is optional at runtime and so
needs to be optional at build time.
Ignore-AOSP-First: rkpd only exists internally
Bug: 259958590
Test: # Add prebuilts for the rkpd module.
m MODULE_BUILD_FROM_SOURCE=true droid
m MODULE_BUILD_FROM_SOURCE=false droid
# Make sure that they build from sources and prebuilts respectively.
Change-Id: Id0c0e482e2928d57a1bb6ee4f3bcd143ca15122c
2023-03-17 22:26:54 +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
Steven Moreland
d733e64b9f
Remove vtsc host tool
...
We haven't used this in years.
Bug: N/A
Test: N/A
Change-Id: If79b05d75ca358b110c2e1723f1dd7f522e13f12
2023-03-17 18:10:31 +00:00
Treehugger Robot
dc1652c955
Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
am: 01321a6bb2
am: cdbc794cd9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665
Change-Id: Iaa151c740697ab6e041a8980dcc1a9266fb5ef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:37:26 +00:00
Treehugger Robot
cdbc794cd9
Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
am: 01321a6bb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665
Change-Id: I498a9489ef3332f29aba7ffe641103185efa234c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:58:38 +00:00
Treehugger Robot
d2b9ad4eb4
Merge "Disable riscv64 dependency on bcc and ld.mc"
2023-03-16 19:39:00 +00:00
Wei Li
3cc80290c6
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
am: 0f06273190
am: 90217d9c4c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540
Change-Id: I1f3f461e3311b8538431c95134c369f6ffa3cdac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 07:03:42 +00:00
Wei Li
90217d9c4c
Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
am: 0f06273190
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540
Change-Id: Ibdca45c0e2c871c9a7f4c26bfa5d18d825112c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 06:27:44 +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
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
c189bbce54
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
am: f63e3bcc68
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:28:11 +00:00
Treehugger Robot
f63e3bcc68
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
am: 90a8a8b81c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Id1c7287ba00f9e905eb10813d65a2dcf81d77667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 16:51:27 +00:00
Treehugger Robot
90a8a8b81c
Merge "add make_erofs to otatools to support erofs apex" am: d4248892e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2477085
Change-Id: Ia58dbc4d9ab685fe63ec0fac27829c1a7aff5e2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 16:16:07 +00:00
Treehugger Robot
d4248892e6
Merge "add make_erofs to otatools to support erofs apex"
2023-03-14 15:47:05 +00:00
Steve Berbary
72e9b8675e
Update Security String to 2023-05-05 am: be772485c3
am: 072f723276
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: If91e327a31200c158cea3639b985710810b87172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 01:58:16 +00:00
Steve Berbary
072f723276
Update Security String to 2023-05-05 am: be772485c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959028
Change-Id: I6d3f9eb5d4c285be1a90852231bf03ef3f5bdcc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 01:17:35 +00:00
Kevin Han
21f3289c94
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
am: a27f3cef8b
am: db4eccb0b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: I59fe77902d69477667e0f6165549a58297c59f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 22:56:18 +00:00
Kevin Han
db4eccb0b2
Merge "Revert "Generate SBOM of the target product in file sbom.spdx in..."" am: afb2495f6f
am: a27f3cef8b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2485539
Change-Id: Icda5099833a520be40518aad9fd61d962e4e0707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 22:03:01 +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
20d6e731bb
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
am: 50aeb8e735
am: 21eadd9e7a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: Ifd807dbccb3346b79b6b69d2c02478121f25f8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 20:02:16 +00:00
Wei Li
d6fba2a779
Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 27d32b0957
am: 1f2ba11661
am: 4534fbc056
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2481062
Change-Id: Ida57382107218ac24e4465dd10888eec738d364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 20:00:19 +00:00
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