Commit Graph

31955 Commits

Author SHA1 Message Date
Bob Badour
fc26ac07a4 Fix recovery_unit_test
Return to using zip instead of SOONG_ZIP

Bug: 235405168

Test: m droid dist
Change-Id: I6f0f2fa7861bca18e34576c920a3c33ffef6b46e
2022-06-08 17:03:02 -07:00
Android Build Coastguard Worker
ae5956dc8a Make change and version bump to TP1A.220609.001
Change-Id: I4c318bfe87500feece1b0ad50c2932b03b9f230f
2022-06-08 23:57:40 +00:00
Colin Cross
3a445abd76 Remove Tiramisu codename from branches downstream of tm-dev
Tiramisu has been finalized in tm-dev, remove the codename from
branches downstream of tm-dev.

Bug: 225745567
Test: treehugger
Change-Id: I12d5a0d018cd8a7dc53136dc67cd23b78b56d55a
2022-06-08 10:04:42 -07:00
Android Build Coastguard Worker
1742a9a283 Make change and version bump to TP1A.220608.001
Change-Id: I2e96592f618657ffbe279c12f7b57aa8ec350cf2
2022-06-07 23:58:22 +00:00
Treehugger Robot
e4af9a8c61 Merge "Fix pitfall: do not delete intermediates dir." am: 5c6b4e029b am: 93eeaf4f67
Original change: https://android-review.googlesource.com/c/platform/build/+/2116088

Change-Id: Id7f81a8bcfae859b9253ae8a97c6616f16bb0cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 23:17:58 +00:00
Treehugger Robot
5c6b4e029b Merge "Fix pitfall: do not delete intermediates dir." 2022-06-07 22:28:40 +00:00
Treehugger Robot
920768cabb Merge "Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img" am: 1053d69c1f am: 7c82ad9e56
Original change: https://android-review.googlesource.com/c/platform/build/+/2116299

Change-Id: I6011de0c0c11fa9031e80a811ed00e6778a68cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 17:03:36 +00:00
Bob Badour
eb9431ee8a Fix pitfall: do not delete intermediates dir.
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests

Change-Id: Ibf1bff6ee67e4958b1e1ea2fbc0385787d3bf0f0
2022-06-07 10:02:12 -07:00
Bowgo Tsai
c85a201d5e Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS for vbmeta_vendor.img
The value of BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS and
BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS are usually the same, e.g.,
--padding_size 4096 --rollback_index 1656979200.

However, in a split build, the value of
BOARD_AVB_VBMETA_SYSTEM_IMAGE_ARGS might be empty.
Using BOARD_AVB_VBMETA_VENDOR_IMAGE_ARGS to correctly
assign the value for vbmeta_vendor.img.

Bug: 232360330
Test: TreeHugger
Change-Id: Ia26816bd309084c3a4c0df6b9f2f3fc5a28bc31a
2022-06-07 11:36:35 +08:00
Android Build Coastguard Worker
9b6bf12e6a Make change and version bump to TP1A.220607.001
Change-Id: I241aea6e19187572a1cafad75fde66f7afd4f6fb
2022-06-06 23:58:19 +00:00
Ulya Trofimovich
043f137132 Merge "Dexpreopt: prepare to merge class loader context from all deps." am: 3eff61ca8a am: a7d23f9e86
Original change: https://android-review.googlesource.com/c/platform/build/+/2079378

Change-Id: I6cb43fb507e9e8d5d8b3746b18238b99c7897231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 13:28:53 +00:00
Ulya Trofimovich
3eff61ca8a Merge "Dexpreopt: prepare to merge class loader context from all deps." 2022-06-06 12:50:34 +00:00
Android Build Coastguard Worker
283dc28a9c Make change and version bump to TP1A.220605.001
Change-Id: I87e5f29f3ffc2c272edbefc4cc11101c27d590e5
2022-06-04 21:58:16 +00:00
Android Build Coastguard Worker
714a82f49c Make change and version bump to TP1A.220604.001
Change-Id: Iecf9026ca0e48767d85389188dbbc6e63c574030
2022-06-04 01:58:11 +00:00
Android Build Coastguard Worker
ec5522e776 Version bump to TP1A.220603.002 [core/build_id.mk]
Change-Id: I0fc55083fa33590f3a182682c72260c8f5b0d4af
2022-06-03 19:05:16 +00:00
Treehugger Robot
f6acd8f004 Merge "Create license metadata for copied targets." am: 1f0c3583a6 am: 62f582272d
Original change: https://android-review.googlesource.com/c/platform/build/+/2109383

Change-Id: Ia76ed06e5021d530bcba851df619048edede15f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:39:57 +00:00
Treehugger Robot
1f0c3583a6 Merge "Create license metadata for copied targets." 2022-06-03 02:05:02 +00:00
Android Build Coastguard Worker
8e403d5447 Make change and version bump to TP1A.220603.001
Change-Id: Icbba99012edee7123364ba3a2d961f34b72cc143
2022-06-02 23:58:46 +00:00
Bob Badour
ba3372439f Create license metadata for copied targets.
Bug: 213388645

Test: m cts dist reportmissinglicenses
Change-Id: I43043e5e7b80d9f3210d6498c215846aec761add
2022-06-02 15:43:08 -07:00
Android Build Coastguard Worker
43d6894ab0 Version bump to TP1A.220602.002 [core/build_id.mk]
Change-Id: I0606c1b28ba5c38f6ff2c9e47dfb3a3ecac8d39a
2022-06-02 19:57:05 +00:00
Jooyung Han
1e1f9f1ccc Merge "Add same_vndk_variants.timestamp to checkbuild" am: 154c195e63 am: 3abf1f7ca9
Original change: https://android-review.googlesource.com/c/platform/build/+/2104585

Change-Id: Ia2b73e71c06becfc5cd62c1ce6d113f146f17a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 08:23:05 +00:00
Jooyung Han
8c0ece3599 Add same_vndk_variants.timestamp to checkbuild
Before aosp/1851043, it was triggered by checkbuild because the
timestamp is attached to $LOCAL_BUILT_MODULE. With aosp/1851043, the
timestamp is not triggered by checkbuild and when a new VNDK lib is
added the check might get skipped in AOSP tree while it can break in the
downstream trees when actually used.

This change adds the same_vndk_variants.timestamp files to checkbuild
again so that CI catches the errors.

Bug: 233616647
Test: prebuilts/build-tools/linux-x86/bin/ninja -f \
  out/combined-aosp_cf_x86_64_phone.ninja -t query checkbuild \
  | grep same_vndk_variants.timestamp

Change-Id: I26043ec001ca2473fccfc19368d035374c663a21
2022-06-02 11:38:12 +09:00
Android Build Coastguard Worker
006b078a3b Make change and version bump to TP1A.220602.001
Change-Id: I7146ee386a47a9182c55cf21c356266e8c45431b
2022-06-01 23:58:07 +00:00
Android Build Coastguard Worker
71339f461e Version bump to SQ3A.220705.003 [core/build_id.mk]
Change-Id: I726b8eb0400433eed516234efe1b727512b54468
2022-06-01 20:45:35 +00:00
Android Build Coastguard Worker
cc924e50f1 Version bump to TP1A.220601.002 [core/build_id.mk]
Change-Id: I50e74201e42782fc8f041ca4cfe6908b686b3cdf
2022-06-01 00:37:10 +00:00
Android Build Coastguard Worker
2639a18b75 Make change and version bump to TP1A.220601.001
Change-Id: Ibfe283ea5cf16796b1d1672892086caf11573609
2022-05-31 23:58:20 +00:00
Paul Duffin
f372ce1415 Disable prebuilts when building with clang coverage
Prebuilts broke the cf_x86_phone-userdebug_coverage_bionic
on tm-release build.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Merged-In: I6eca2fcc670dccef4a6cd9dc3f08003eb47e5bca
Change-Id: I40c10e88b824e5f4b783b1dc0a500096fad209b2
2022-05-31 17:10:41 +00:00
Android Build Coastguard Worker
0d912c12c2 Make change and version bump to TP1A.220531.001
Change-Id: I2d595efc5c6401501abbd917a30dd4ca103916f6
2022-05-30 23:58:59 +00:00
Android Build Coastguard Worker
c995427332 Make change and version bump to TP1A.220530.001
Change-Id: I73202d16035bc2c69bc11a4d9b8f2e30ee69526d
2022-05-29 21:59:02 +00:00
Android Build Coastguard Worker
bfb34da552 Make change and version bump to TP1A.220529.001
Change-Id: I8b5e6933f02de0ecc03466dd769ab4487c123cf4
2022-05-28 21:58:30 +00:00
Android Build Coastguard Worker
98a9c088f7 Make change and version bump to TP1A.220528.001
Change-Id: Ic08018a6b0b101bbdde8a5108ba216aec06097d5
2022-05-28 01:58:47 +00:00
Android Build Coastguard Worker
ca7160e531 Version bump to TP1A.220527.002 [core/build_id.mk]
Change-Id: I40ccd3aaaa14dca3038c117c3c4711013ad3736b
2022-05-27 20:29:01 +00:00
Android Build Coastguard Worker
dd4fa2e11b Make change and version bump to TP1A.220527.001
Change-Id: I2d9740f427b60a039532fa1c1aa04ce5a07bfc60
2022-05-26 23:57:53 +00:00
Junfeng Wu
ac2f342591 Merge "Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/" am: 76017c9301 am: 9d192c82c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2098796

Change-Id: Ic27de365583d07e8d2db63ff030b23671db964b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:47:53 +00:00
Android Build Coastguard Worker
557534ae68 Make change and version bump to TP1A.220526.001
Change-Id: Ic82b28a280c681e7668792ce2b7d9a6e50a41b2b
2022-05-25 23:58:05 +00:00
Anton Hansson
09fc47b6ce Remove unused dependencies from sdk goals
The SDK no longer includes system images, so no longer needs to depend
on targets that are only relevant for the system images.

Remove all the explicit dependencies that end up depending on
"everything" but are not included in the sdk zip.

Two positive side-effects:
- fewer unused things get built (now ~32k targets, down from ~108k)
- apexes no longer get built, eliminating the risk of mismatch between
  module sdk prebuilts and source-built AOSP apexes.

There are some potential risks with this CL:
- because we no longer forcefully rebuild everything, if there are bugs
  in dependencies of exising files in the SDK, incremental builds may
  not rebuild them.
- some files that get built into the SDK may be being built as a
  side-effect of other files included in the SDK, so removing one file
  may cause another to not get built. The solution to that is to add
  the file not getting built to ALL_SDK_FILES.

Bug: 205008975
Test: m sdk sdk_repo dist && diff sdk.zip before/after (identical)
Merged-In: I97284864f66aa88556fbe16864f45b04be97634e
Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
2022-05-25 13:16:13 +00:00
Anton Hansson
a0ab45384d Remove notice file for sdk system image
The system image itself is being removed from the sdk zip,
so remove the NOTICE file for it at the same time.

Bug: 205008975
Test: m sdk sdk_repo dist
Merged-In: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
2022-05-25 13:16:09 +00:00
Junfeng Wu
6ecd7d177a Use OUT_DIR to find the r8/d8 binaries instead out hard coded out/
Test: USE_RBE=true m
Bug: 233046271

Change-Id: I71d71a3560a97a2173bf415fe8a584ea0c0a5942
2022-05-25 06:29:46 +00:00
Android Build Coastguard Worker
bcece8e777 Version bump to TP1A.220525.002 [core/build_id.mk]
Change-Id: Ic3bdca7b1becf5c028f9f82cbbc18048affe9352
2022-05-25 03:43:16 +00:00
Android Build Coastguard Worker
0f926fb027 Make change and version bump to TP1A.220525.001
Change-Id: I7eea435267810cc6ee02bb7eb15939dad2ac4b2e
2022-05-24 23:58:02 +00:00
Android Build Coastguard Worker
183b53f429 Version bump to TP1A.220524.002 [core/build_id.mk]
Change-Id: Ibb36d47349159781f2351a59001f7e147322ec88
2022-05-24 18:39:15 +00:00
Ulya Trafimovich
51ad6b81a8 Dexpreopt: prepare to merge class loader context from all deps.
The makefile implementation of dexpreopt is lagging behind the Soong
implementation in the way it handles transitive dependencies: Soong
propagates class loader context through transitive dependencies, such
as static libraries, but makefiles only propagate that information
through uses-library dependencies.

This discrepancy is caused by the difficulty of handling class loader
contexts in makefies: since there is no topological order in handling
module and its dependencies, the information is propagated via file
level dependencies on dexpreopt.configs and merged into the module's
dexpreopt.config with a python script.

To handle transitive dependencies correctly, it is necessary to
generate dexpreopt.config files for all libraries, not just those that
enable dexpreopt.

This change only prepares dex_preopt_odex_install.mk for that and
updates if for corresponding changes in manifest_check.py. It does not
enable generation of dexpreopt.config files for non uses-library
dependencies (e.g. static libraries). This will be done as a follow-up.

Changes:

  - renamed option for dependency dexpreopt.config files
  - added option for self dexpreopt.config
  - moved variable definitions so that they can be used both by
    uses-library check and dexpreopt command
  - add 'Optional' field in makefile-generated dexpreopt.config to
    align it on par with Soong-generated configs
  - modify dex_preopt_config_merger.py to add uses-libraries propagated
    via dexpreopt.config files

Bug: 214255490
Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \
    && adb wait-for-device && adb root \
    && adb logcat | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
    # a few unrelated errors caused by missing optional uses-libraries
    #   android.net.ipsec.ike
    #   androidx.window.extensions
    #   androidx.window.sidecar
    # that were present before this patch
Change-Id: I6522319a8415f22f90fc96059a34675fb830e5cc
2022-05-24 16:02:49 +01:00
Android Build Coastguard Worker
c32abbd601 Make change and version bump to TP1A.220524.001
Change-Id: I31b8326b073524feffe441d7bd9cf93a0e22da62
2022-05-23 23:58:05 +00:00
Dario Freni
c7b5e2c0ce Retry: Enable mainline prebuilts on tm-dev branch.
Except for santizer and framework Java coverage tests as they require
specialized prebuilts built from a matching configuration and we do not
provide them.

And products that use dex2oat(d)s as they are not available as a
prebuilt.

And products that cross compile to arm64 and linux_bionic on the host
as prebuilts for that are not available.

And atv/tv products as they break when building against prebuilts.

Bug: 230478310
Bug: 223592962
Test: presubmit
Merged-In: I3ed091156c4b39dad6eaf578144ac3d070025988
Merged-In: I9731400acfade95b3eab8f2d99fddb4cf856aa91
Merged-In: I43fa4ae8db51012eaf78d70fe65e9e0a3f7eca16
Change-Id: Ib01ba9e2e3c2225c88d52b6811edf04aff02c81e
2022-05-23 18:42:27 +00:00
Treehugger Robot
7e9e1ae787 Merge "Add a doc about dex_preopt_check." am: a3dc792131 am: eabde79e55
Original change: https://android-review.googlesource.com/c/platform/build/+/2098894

Change-Id: Iec3ed9d888831bc77aa4c5604edfb3d46de1b38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:10:18 +00:00
Treehugger Robot
a3dc792131 Merge "Add a doc about dex_preopt_check." 2022-05-23 10:25:43 +00:00
Android Build Coastguard Worker
28a378d8be Make change and version bump to TP1A.220523.001
Change-Id: I0e4ff8563b9633225cb0419c777ee2a2913ccaba
2022-05-22 21:20:40 +00:00
Android Build Coastguard Worker
4e75ee2c60 Make change and version bump to TP1A.220522.001
Change-Id: I21ce673b506225bbd187e1b5435f28aad15de682
2022-05-21 21:20:03 +00:00
Android Build Coastguard Worker
327ffae48f Make change and version bump to TP1A.220521.001
Change-Id: I00f6325d2df05b7e8c824b964d6a44dbef87788c
2022-05-21 01:21:07 +00:00
Paul Duffin
dddc036bd1 Revert "Enable mainline prebuilts on tm-dev branch."
This reverts commit de9f0b12f1.

Reason for revert: breaks build_test and build_test2 on git_tm-dev.

Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.

Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
2022-05-21 00:17:09 +00:00