Commit graph

76732 commits

Author SHA1 Message Date
Treehugger Robot
2fc9d4c28b Merge "Revert "Do not compress zip file for unit tests."" am: 266225ccb2
Original change: https://android-review.googlesource.com/c/platform/build/+/2096861

Change-Id: I23b193523bc8fd57ffa2ab425eeed31ca53d51c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:01:55 +00:00
Treehugger Robot
266225ccb2 Merge "Revert "Do not compress zip file for unit tests."" 2022-05-13 23:44:57 +00:00
Sam Saccone
7d7ae94bef Revert "Do not compress zip file for unit tests."
This reverts commit a24c755f66.

Reason for revert: not worth the additional storage cost.

Change-Id: I8ed24ddef4ac3f640bf35e79cddf433e0df0854d
2022-05-13 19:55:25 +00:00
Anton Hansson
3a3e601827 Merge "Remove unused dependencies from sdk goals" am: 59f95bcd1c
Original change: https://android-review.googlesource.com/c/platform/build/+/2096393

Change-Id: I3ebbdd2ce53488f5298163d7f94cacf0f1d41296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 09:37:37 +00:00
Anton Hansson
59f95bcd1c Merge "Remove unused dependencies from sdk goals" 2022-05-13 08:55:55 +00:00
Treehugger Robot
92fb295d7e Merge "Lightweight ninja writer in Python" am: 69b1b0c10a
Original change: https://android-review.googlesource.com/c/platform/build/+/2094485

Change-Id: I5c9f6c55bafaef2db07aa8936c8f8f9eebacac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 00:17:04 +00:00
Treehugger Robot
69b1b0c10a Merge "Lightweight ninja writer in Python" 2022-05-12 23:46:55 +00:00
Treehugger Robot
c7de0493f1 Merge "Checkpoint new build orchestrator" am: a96be433c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2096153

Change-Id: Id670437d8bb08dff6cac932cee28986a3c0bd20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 23:37:59 +00:00
Treehugger Robot
a96be433c4 Merge "Checkpoint new build orchestrator" 2022-05-12 22:55:33 +00:00
Anton Hansson
af94854296 Slim down the sdk product
The sdk_phone_armv7 product is designed to build system images, which
adds unnecessary dependencies and enables unnecessary checks (such as
verifying dexpreopt artifacts).

Bug: 205008975
Test: m sdk sdk_repo dist && diff android-sdk.zip (only build.prop diffs)
Change-Id: I940655c39a3ae58839521416abafaf461df44921
2022-05-12 22:41:02 +00:00
Joe Onorato
7cf6f97775 Checkpoint new build orchestrator
Test: rm -rf out && multitree_build
Change-Id: Ic274182f0925f30d56227597b65e5b9ef3b19707
2022-05-12 12:12:38 -07:00
Michael Groover
9401efe64f Merge "Add support for -providerArg in signapk" am: 9d1a0a47d5
Original change: https://android-review.googlesource.com/c/platform/build/+/1760832

Change-Id: I83cb14090adff03179d354ad9fcdb839cd636498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:05:09 +00:00
Spandan Das
aacf2376a5 Lightweight ninja writer in Python
Summary:
- Create python classes for ninja vocbulary in `ninja_syntax.py`. These
  classes will be serialized to a ninja file
- Create a Writer class in `ninja_writer.py`. The current API supports
  adding variables,rules,build actions, etc. This can be extended in the
  future (See `test_ninja_writer.py` for examples)

Future Work:
 - Update the `Subninja` class once chDir is supported (aosp/2064612)
 - Support a width parameter that will be used to wrap long lines of
   text. This will improve readability of the generated files

Expected Use Case: Multi-tree build orchestrator

Test: python ./test_ninja_syntax.py
Test: python ./test_ninja_writer.py

Change-Id: I90c7ee69ddeb7c20c3fd4fca5a911dddbf2253bd
2022-05-12 17:47:29 +00:00
Michael Groover
9d1a0a47d5 Merge "Add support for -providerArg in signapk" 2022-05-12 17:40:31 +00:00
Colin Cross
265c1cc9a3 Merge "Remove HOST_DALVIK_*" am: 544aedda27
Original change: https://android-review.googlesource.com/c/platform/build/+/2059991

Change-Id: Icaaef9cc29cbaba05e461341c6ea4296983568d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:18:27 +00:00
Colin Cross
544aedda27 Merge "Remove HOST_DALVIK_*" 2022-05-12 15:44:20 +00:00
Pierre-Clément Tosi
c7b837872d Create $(zip_root)/PVMFW & archive prebuilt used
It might be useful to have access to the prebuilt that the Android build
used to create the pvmfw partition so add a new directory (similarly to
other partitions) containing the prebuilt (which is also the only
content of the partition). This is particularly useful in ATC, when
detecting if the prebuilt was updated by the build.

Bug: 232253742
Test: m
Change-Id: I1116d91ffb073821568bcaeed30bbb43873dcafa
2022-05-12 16:37:46 +01:00
Anton Hansson
55a8f02ea8 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)
Change-Id: I97284864f66aa88556fbe16864f45b04be97634e
2022-05-12 12:28:49 +00:00
Treehugger Robot
006413cb62 Merge "Remove -j1 for aidl-freeze-api" am: b4eef93771
Original change: https://android-review.googlesource.com/c/platform/build/+/2095383

Change-Id: I2a5010615d9ffcc19521d120c05eba0e7a48951e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:57:31 +00:00
Treehugger Robot
0221a9a4af Merge "Remove all_product_makefiles" am: a09c684e27
Original change: https://android-review.googlesource.com/c/platform/build/+/2095123

Change-Id: I67640034a8876c10b10c0c99a0dc6be63a6e3fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 00:56:03 +00:00
Treehugger Robot
b4eef93771 Merge "Remove -j1 for aidl-freeze-api" 2022-05-11 23:12:07 +00:00
Michael Groover
2f8aad4f7f Add support for -providerArg in signapk
signapk currently accepts a Provider class that can be instantiated
and inserted before the signing. This commit adds support to specify
a -providerArg parameter that can be used to configure the Provider.
Prior to JDK 9 a Provider would accept a providerArg in a constructor
accepting a String; in JDK 9+ a Provider should first be instantiated
with the zero-arg constructor, then the configure method should be
called with the providerArg.

Bug: 142334653
Bug: 190974913
Fixes: 232134730
Test: Manually verified new Provider can be inserted with pre- and
      post-JDK 9 behavior.
Change-Id: I96f027640c59d3357e8dcf656626d1601bfef861
2022-05-11 21:55:24 +00:00
Cole Faust
6d0c689c23 Merge "Add function for flattening 2d lists" am: 8ccac5198d
Original change: https://android-review.googlesource.com/c/platform/build/+/2088663

Change-Id: I01809fe3d1c11d74e3284a16dcd6f3834db5fc38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:37:13 +00:00
Treehugger Robot
b2d8f7f5b9 Merge "Temporary hack for making T->S downgrade work" am: 4890a4ea35
Original change: https://android-review.googlesource.com/c/platform/build/+/2092783

Change-Id: I5c9099a800dc40e459293c4144c5910f911156fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:36:22 +00:00
Treehugger Robot
a09c684e27 Merge "Remove all_product_makefiles" 2022-05-11 18:31:14 +00:00
Kelvin Zhang
823d695d3a Install new snapuserd_ramdisk stem
This installs snapuserd to /system/bin/snapuserd_ramdisk instead of
/system/bin/snapuserd

Test: th
Bug: 219841787
Change-Id: I517e251bf1f895b9de993ec7e5f57f11205172c8
2022-05-11 11:30:26 -07:00
Jared Duke
7d0c90b51f Add keep rules for @KeepForWeakReference annotation
Ensure annotated fields are kept when treeshaking-related optimizations
are enabled. Note that this still allows field removal if tree shaking
reveals no references, but will avoid removal if there are references
that might impact downstream usage, e.g., weak references.

Bug: 227455445
Test: atest InternalAnnotationsTest
Change-Id: I59c6277c43b14c5de8154fa1eefad01f0702e413
2022-05-11 09:47:12 -07:00
Colin Cross
a9203e6d87 Remove HOST_DALVIK_*
There are no more BUILD_HOST_DALVIK_* modules, remove the host dalvik
support.  The equivalent support in Soong just copies the device dex
file to the host dalvik location.

Test: m checkbuild
Change-Id: I4bcf916518317b28d3217994b2fe9ee95d7f50d6
2022-05-11 08:17:45 -07:00
Jeongik Cha
26e9dd30a4 Remove -j1 for aidl-freeze-api
Because bpmodify is safe in multi-process env.

Bug: 190577319
Bug: 229413853
Test: aidl-freeze-api
Change-Id: Ie47afc25e2259bbcbbff50f98fa9d36887558d27
2022-05-11 01:25:19 +00:00
Cole Faust
4edc0b30ff Remove all_product_makefiles
It was unused, along with all_product_configs.

Bug: 228518445
Test: Presubmits
Change-Id: Ibd105241581f8b03254b8fee382d916ea3a98890
2022-05-10 15:39:10 -07:00
Cole Faust
8ccac5198d Merge "Add function for flattening 2d lists" 2022-05-10 05:26:03 +00:00
Treehugger Robot
4890a4ea35 Merge "Temporary hack for making T->S downgrade work" 2022-05-10 04:23:32 +00:00
Android Build Coastguard Worker
1f6930364b Version bump to SQ3A.220605.009 [core/build_id.mk]
Change-Id: I9c038f563e6798cf18dffd83fc505a4dbb5ca443
2022-05-09 23:50:02 +00:00
Kelvin Zhang
9a698e6a9f Temporary hack for making T->S downgrade work
Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.

Test: generate T->S downgrade OTA for O6
Bug: 231656318
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
2022-05-09 10:20:52 -07:00
Android Build Coastguard Worker
af4256c1a8 Version bump to SQ3A.220605.008 [core/build_id.mk]
Change-Id: Id449fd8f20d723b45e20f93810b95ed437c84c8f
2022-05-06 18:47:18 +00:00
Treehugger Robot
e654cbdfcd Merge "Disable verity for VABC updates on android R" am: 46c4bb37d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2087483

Change-Id: I18376fe419fe6f73e47e88e2474ac4f91160f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 00:21:04 +00:00
Treehugger Robot
46c4bb37d1 Merge "Disable verity for VABC updates on android R" 2022-05-06 00:03:20 +00:00
Cole Faust
6f6060a358 Add function for flattening 2d lists
Bug: 226974242
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Iae977b34ca0ac156ec795c54f4951c769fa994dd
2022-05-05 11:41:59 -07:00
Ulya Trofimovich
98a1730bf9 Merge "Extend hardcoded list of optional uses-libraries." am: de1949b562
Original change: https://android-review.googlesource.com/c/platform/build/+/2087124

Change-Id: I771069885c7e992ae019a26ccd117ce39860a71d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 13:33:52 +00:00
Ulya Trofimovich
de1949b562 Merge "Extend hardcoded list of optional uses-libraries." 2022-05-05 12:57:54 +00:00
Treehugger Robot
d436fa704b Merge "envsetup.sh: fix adb tab completion" am: 1ef63b944e
Original change: https://android-review.googlesource.com/c/platform/build/+/2087123

Change-Id: I9324867e6b23d6288150ac045bcfb724a381de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 09:07:17 +00:00
Treehugger Robot
1ef63b944e Merge "envsetup.sh: fix adb tab completion" 2022-05-05 07:52:42 +00:00
Kelvin Zhang
a9a87ec204 Disable verity for VABC updates on android R
Bug: 230277030
Test: th
Change-Id: I2872c490c852fb7d3784721e191ece80b4b1fd58
2022-05-04 16:45:14 -07:00
Xin Li
56c9d9b5ea [automerger skipped] Merge "Merge SP2A.220505.002" am: c01930f7d7 -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 8f3602319f is already in history

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

Change-Id: Ib821389aff4cc0784dd97c936b0e4c78779901e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:57:09 +00:00
Xin Li
490ab8841f [automerger skipped] Merge SP2A.220505.002 am: a08bbcebb4 -s ours
am skip reason: Merged-In I5a35451e14cba5f115ab66926d62c4fa4556a267 with SHA-1 8f3602319f is already in history

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

Change-Id: I1410efe84d6b8cba3362f1e6d956f8cae0693afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:56:54 +00:00
Xin Li
c01930f7d7 Merge "Merge SP2A.220505.002" 2022-05-04 20:30:21 +00:00
Treehugger Robot
14e4ad63e5 Merge "fixup! Embed host liblz4.so in target_files" am: 5161627644
Original change: https://android-review.googlesource.com/c/platform/build/+/2083403

Change-Id: Id1a30721887e9d46e169f4ecc71d47414b69265f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 18:11:55 +00:00
Treehugger Robot
5161627644 Merge "fixup! Embed host liblz4.so in target_files" 2022-05-04 17:23:40 +00:00
Mårten Kongstad
cb5c73fd9e envsetup.sh: fix adb tab completion
The adb module has been moved from system/core to packages/modules/adb.
Update the path to the adb tab completion script accordingly.

Also teach envsetup.sh to complain if completion files are not found.

Test: manual: adb tab completion works
Test: source build/envsetup.sh && declare -F _adb
Change-Id: I7d6fda3813b95e64de7b1953675f66659e750c31
2022-05-04 14:47:20 +00:00
Ulya Trafimovich
0932a821c0 Extend hardcoded list of optional uses-libraries.
This is a temporary workaround that should be replaced with build logic
that would propagate optionality via generated exported-sdk-libs 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'
    # empty output, no errors at boot
Change-Id: I05e22e5f72a9f936b6e0010240f5e71849a9b2b0
2022-05-04 13:36:47 +01:00