Commit Graph

83997 Commits

Author SHA1 Message Date
Julien Desprez
1c6aa54306 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8 am: 660e9fa2e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:48:26 +00:00
Julien Desprez
660e9fa2e3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b am: 63c3099dc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I4b9328b17a82fdbad4b3bd97de40f256c3e9f6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:11:39 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 02:13:57 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 01:33:44 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 00:58:49 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
2023-03-22 00:32:22 +00:00
Treehugger Robot
c02e0f7ad8 Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6 am: 8925166fff
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I38ee795422205a79eec93a6f55fbb6570e38811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:49:21 +00:00
Nicolas Geoffray
5325cd5cdf Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36 am: 22d145424a
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: Icac6f47314a704c0836e17a20109da1e72b248a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:48:18 +00:00
Treehugger Robot
8925166fff Merge "Disable system_server.zip generation for ART prebuilts" am: d7600be9a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2496535

Change-Id: I3d927a6953c24d49ad1f3a26bd3ffbe88b399c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:11:34 +00:00
Nicolas Geoffray
22d145424a Merge "Use the boot image mainline extension when dexpreopting in Make." am: 3a6ebaac36
Original change: https://android-review.googlesource.com/c/platform/build/+/2497995

Change-Id: I2888a5d1b20ee95a94514fed426e4bf9b5e3be51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:10:03 +00:00
Treehugger Robot
d7600be9a6 Merge "Disable system_server.zip generation for ART prebuilts" 2023-03-21 15:19:58 +00:00
Nicolas Geoffray
3a6ebaac36 Merge "Use the boot image mainline extension when dexpreopting in Make." 2023-03-21 14:51:20 +00:00
Pranav Gupta
1da7219ed1 Disable system_server.zip generation for ART prebuilts
system_server.zip does not need to be generated when using the prebuilt mainline modules or if ART_MODULE_BUILD_FROM_SOURCE is false or if MODULE_BUILD_FROM_SOURCE is false

Bug: 274051753
Change-Id: Ifc638eb4e14ed9ea078125d1780a02b9de6b9ccc
2023-03-21 07:30:37 +00:00
Treehugger Robot
fe599cb1b2 Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9 am: 5c129b5fc7
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705

Change-Id: Ie1d60fecb5d5a5dc644fb909e421581582ffe8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 03:58:02 +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
5c129b5fc7 Merge "Disable frameworks loading of renderscript libs" am: 0a70a53cc9
Original change: https://android-review.googlesource.com/c/platform/build/+/2485705

Change-Id: I4bda385b60349b562a3dbe11ec2ff843efd3baf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 03:37:33 +00:00
Treehugger Robot
0a70a53cc9 Merge "Disable frameworks loading of renderscript libs" 2023-03-21 03:27:53 +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
Jiakai Zhang
fb2734e36b Use the boot image mainline extension when dexpreopting in Make.
aosp/2470961 introduces a boot image mainline extension. We need to use
it when dexpreopting apps in Make.

Bug: 274059172
Bug: 269230245
Test: See "boot-framework-adservices.art" in
  out/target/product/vsoc_x86_64/obj/APPS/PrebuiltGmail_intermediates/oat/x86_64/package.invocation
  on internal master.
Change-Id: Ic0b1753a0066bd16a31de028743f1ad908e9bdfc
2023-03-20 18:42:13 +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