Commit graph

83977 commits

Author SHA1 Message Date
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
d0362d7b16 Merge "Remove vtsc host tool" am: 896e7c715e
Original change: https://android-review.googlesource.com/c/platform/build/+/2495778

Change-Id: I86f0c32a9fd70225142ca639ceca9496ca787045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 03:18:08 +00:00
Treehugger Robot
896e7c715e Merge "Remove vtsc host tool" 2023-03-21 02:14:34 +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
708b70a554 Merge "Add rkpd to the list of individually toggleable modules" am: 5f3ddd4f41
Original change: https://android-review.googlesource.com/c/platform/build/+/2497575

Change-Id: I2af15504339a524984cacd9be201ccb26ec9c1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 20:51:40 +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
299878fb17 Merge "Create image apexes by default instead of flattened apexes" am: 14108b6a57
Original change: https://android-review.googlesource.com/c/platform/build/+/2491212

Change-Id: I8b594224eace23296b5b9a8a7d6a16d5b14b9f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 20:28:26 +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
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
d90bc8e5ee Merge "[config] Boards can supply custom super image script" am: 6dcf429d8f
Original change: https://android-review.googlesource.com/c/platform/build/+/2496355

Change-Id: I9bfbdb88583a77da1dcddc78d10990ecc75ac889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 18:23:30 +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
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
863bf01391 Merge "Add python mobly test template xml." am: 0a25e67404
Original change: https://android-review.googlesource.com/c/platform/build/+/2469502

Change-Id: Iaa49cce73a448b3538a77004a9ec82d2699980fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 02:50:34 +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
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
e2b36a78d8 Merge "Rename rbcrun/cmd to make go install work properly" am: 7a40e97d74 am: 191c775746
Original change: https://android-review.googlesource.com/c/platform/build/+/2492675

Change-Id: I38c87021bf2330a3cf59ac0523184bac263ed93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:58:51 +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
191c775746 Merge "Rename rbcrun/cmd to make go install work properly" am: 7a40e97d74
Original change: https://android-review.googlesource.com/c/platform/build/+/2492675

Change-Id: I50ff24dd86d797f44c6db22fd87e9f120ec30e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:40:26 +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
01321a6bb2 Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4eb4
Original change: https://android-review.googlesource.com/c/platform/build/+/2448665

Change-Id: I4e2a3c800dd0c8eb914b35c937173e1649085c50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:21:00 +00:00
Treehugger Robot
d2b9ad4eb4 Merge "Disable riscv64 dependency on bcc and ld.mc" 2023-03-16 19:39:00 +00:00
Wei Li
58230623d7 Merge "Clean up the strings and use f-strings instead of string.format()." am: 4e824bc8e8 am: 757ba511e2
Original change: https://android-review.googlesource.com/c/platform/build/+/2491846

Change-Id: I25506dc0f3c21c413833a832bfc9045ca21b5d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 05:04:34 +00:00
Wei Li
757ba511e2 Merge "Clean up the strings and use f-strings instead of string.format()." am: 4e824bc8e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2491846

Change-Id: Icd0631926fed6d70c365f8d7ace50ebb9c011adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 04:29:31 +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
b5b28fae99 Merge "Add an automated tools for generating brick OTA package" am: 4fac9d776c am: ac4fb5a4d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2488336

Change-Id: Iee4349d628ea8680135918bb4cbe71d6b047e199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:42:24 +00:00
Treehugger Robot
ac4fb5a4d8 Merge "Add an automated tools for generating brick OTA package" am: 4fac9d776c
Original change: https://android-review.googlesource.com/c/platform/build/+/2488336

Change-Id: Ic6f20794af47294d93a4dfd6c2e16a7612bb18cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:06:18 +00:00
Treehugger Robot
4fac9d776c Merge "Add an automated tools for generating brick OTA package" 2023-03-15 09:24:40 +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
0f06273190 Merge "Generate SBOM of the target product in file sbom.spdx.json in product out directory." am: 15187b6f1a
Original change: https://android-review.googlesource.com/c/platform/build/+/2485540

Change-Id: I24efb9909e63c335c54153f3501c04ce2eaaf1af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 05:51:30 +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
Xin Li
4826379652 [automerger skipped] Merge "Merge Android 13 QPR2" am: eb2ad4b002 -s ours am: b9f34c8e42 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2486777

Change-Id: I13492b572b02c148a7c24182e5ec71bebe705c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:08:36 +00:00
Xin Li
d30d753729 [automerger skipped] Merge Android 13 QPR2 am: 48ba26b496 -s ours am: 51161f4d38 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2486777

Change-Id: I7d6f62e1b672b13b88b2f44eb189b893ec31201c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:16 +00:00
Xin Li
b9f34c8e42 [automerger skipped] Merge "Merge Android 13 QPR2" am: eb2ad4b002 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2486777

Change-Id: I7d153e8a1eff2277488a54aabea047b1c809d59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:34:42 +00:00
Xin Li
51161f4d38 [automerger skipped] Merge Android 13 QPR2 am: 48ba26b496 -s ours
am skip reason: Merged-In I20a857714f506097c06cf8168b7ec368a3117612 with SHA-1 5ca47f57b1 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2486777

Change-Id: Ic45f7b88fb4ad8bd39ff2a5477e963831d3bcaf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:25 +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
Steve Berbary
40f22316a3 [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours am: b77d990efa -s ours am: ff3bc8bedf -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: If2ba7952c8936f21c44576069d3ddf41ae62b557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:00:28 +00:00
Xin Li
eb2ad4b002 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:46 +00:00
Steve Berbary
ff3bc8bedf [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours am: b77d990efa -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I5b1d296153601b2802ca148b2137d956fc9a32cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:24:44 +00:00
Steve Berbary
b77d990efa [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I01a359a0cbd8f5e2e35f3f45c60010a8bcd6ca52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:23:42 +00:00
Steve Berbary
4c14c3f28d [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I0d7ce6bc3900bdaeedef719e4f14ff8e2e3b0262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:42:19 +00:00
Steve Berbary
f60d4fdf67 [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ifffb57e6dcab29f0c18dd9d82254dd0938774e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:05:09 +00:00
Steve Berbary
2c4dad8ca3 Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:23:46 +00:00
Steve Berbary
07c703d53d Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:44:19 +00:00