Commit Graph

34601 Commits

Author SHA1 Message Date
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
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
Android Build Coastguard Worker
741e4e5b4d Make change and version bump to UP1A.230321.001
Snap for 9781601 from c3d308eb5e to udc-release

Change-Id: Ifadd4bbb6285c33efc4e8d4ee3f4ce441b88ace3
2023-03-21 04:04:47 +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
Spandan Das
0c01c90544 Update hardcoded references to android_*stubs_current
The hardcoded references should be updated to variables exported by
Soong. This enables the stub selection logic to exist in a single place.

Test: TH
Test: No change in out/build-<lunch_product>.ninja

Change-Id: I153f1c6ffc6c93d8a64c3edfef3e8d52c84207a3
2023-03-20 21:59:18 +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
Android Build Coastguard Worker
50d934a411 Version bump to UP1A.230320.002 [core/build_id.mk]
Change-Id: Idf48064c8097eef1c847aa971381fe16468006bc
2023-03-20 19:22:08 +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
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
Android Build Coastguard Worker
e51ac4399d Make change and version bump to UP1A.230320.001
Snap for 9774436 from 781e7210e2 to udc-release

Change-Id: Ia7fd0c1e31aae5f95964fb82e5f920aac34dc5c8
2023-03-20 02:04:08 +00:00
Android Build Coastguard Worker
2f89cd7d9a Make change and version bump to UP1A.230319.001
Snap for 9773131 from 781e7210e2 to udc-release

Change-Id: I4d223feaa8cf6f3ed046b52dc7f7edce08600c34
2023-03-19 02:04:47 +00:00
Android Build Coastguard Worker
8f54bc05b0 Make change and version bump to UP1A.230318.001
Snap for 9769041 from 781e7210e2 to udc-release

Change-Id: I7c4e0974de74929ee85d0ef8ea9d6c86d2cea0ed
2023-03-18 04:03:30 +00:00
Ludvig Hansson
6d11991f1d Clean additional Robolectric variable
Add LOCAL_INSTRUMENT_SRCJARS to list of variables
to reset when calling CLEAR_VARS from a makefile.

This fixes an issue when generating JaCoCo coverage
reports for Robolectric tests.
The value from another module would bleed into the current
one causing the wrong source directory to be used during
report creation, which in turn resulted in an empty report.

This would only happen for modules still using 'Android.mk';
when using Android.bp files the value for LOCAL_INSTRUMENT_SRCJARS
is always set from 'robolectric.go'.

Bug: 214588476
Test: m clockwork-frameworks-robotests-jacoco
Change-Id: I7b527c82bdbe4db06acd1a1fa1a2443e64ed703d
(cherry picked from commit cc799bdf9161dc3c0f6eb437ed064f9712bbfd6b)
2023-03-17 23:55:29 +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
Android Build Coastguard Worker
176641b46b Version bump to UP1A.230317.004 [core/build_id.mk]
Change-Id: I00b12471f4c403ab2bdb18849e41e411397123aa
2023-03-17 20:14:04 +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
Android Build Coastguard Worker
8588a423f4 Version bump to UP1A.230317.003 [core/build_id.mk]
Change-Id: I31730dadd36271f0b352f1168699917394bf4ceb
2023-03-17 11:37:58 +00:00
Android Build Coastguard Worker
06ffaf8189 Version bump to UP1A.230317.002 [core/build_id.mk]
Change-Id: I56e87b9efd59495ac3625a0446abe504189308f2
2023-03-17 04:27:58 +00:00
Android Build Coastguard Worker
b73485c6d2 Make change and version bump to UP1A.230317.001
Snap for 9762093 from 781e7210e2 to udc-release

Change-Id: I841c2a8fbbc911b6c52a35521db985acfba9671a
2023-03-17 04:03:31 +00:00
Android Build Coastguard Worker
18cd168fd6 Version bump to UP1A.230316.003 [core/build_id.mk]
Change-Id: Iab6e0bb11a76c547a519fe57c47d1acf332e2392
2023-03-16 23:37:56 +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
Android Build Coastguard Worker
01c8f73189 Make change and version bump to UP1A.230316.002
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22119304'] into udc-release.

Change-Id: I85c90aa1ce35fd81b54fc6a94ab7e8ed9e32805a
2023-03-16 17:10:14 +00:00
Android Build Coastguard Worker
0c1e6a5b87 Make change and version bump to UP1A.230316.001
Snap for 9754537 from 4a310a9c8c to udc-release

Change-Id: I22822dd807a9e21a0a5277cf8cb2cc358bfe161c
2023-03-16 04:02:22 +00:00
Spandan Das
251205d866 New product config flag to gate blueprint modules
Bug: 270654958

Example usage:
PRODUCT_INCLUDE_TAGS += use_myspecial_sdk

This also populates the allowlist with go/nogo mainline tags. Usage of
`PRODUCT_INCLUDE_TAGS` outside this allowlist will raise an error
in product config

Test: TH

Change-Id: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
Merged-In: Ica82a8f65cbfda600d72fc54fb873c1eaa1666a7
(cherry picked from commit 055e5f89a7bc5d12877fc6bc8110c1e1e8b6ee59)
2023-03-15 22:15:30 +00:00
Android Build Coastguard Worker
5e2cdd4383 Version bump to UP1A.230315.003 [core/build_id.mk]
Change-Id: Id372ad230cb66cf59378538e33fe2f22a7cadcf5
2023-03-15 17:44:03 +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
Android Build Coastguard Worker
cfd811d63e Version bump to UP1A.230315.002 [core/build_id.mk]
Change-Id: I1c561971eea1c4dc69c45099918ea5e61bff887f
2023-03-15 02:49:58 +00:00
Android Build Coastguard Worker
374e7c3781 Make change and version bump to UP1A.230315.001
Snap for 9744603 from c189bbce54 to udc-release

Change-Id: I71cd983fcd3e79200e877d832a4bcc5fbbbede59
2023-03-15 02:12:29 +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
Android Build Coastguard Worker
8d1f06e915 Version bump to UP1A.230314.003 [core/build_id.mk]
Change-Id: I0055b7fdc09e2efdb71fda12fd2b23a684b22e67
2023-03-14 21:48:06 +00:00