Commit graph

75921 commits

Author SHA1 Message Date
Ulya Trofimovich
8b9f334eed Revert "Dexpreopt: prepare to merge class loader context from al..."
Reason for revert: performance regression on AppStartup.
Reverted Changes:
I6522319a8:Dexpreopt: prepare to merge class loader context f...
Ic8528dffd:manifest_check.py: add uses-libraries propagaged v...

Bug: 235304939
Bug: 214255490
Change-Id: Iff6ad6f0d862df259bf9e3dd7017c268dbcbf8bf
2022-06-13 09:06:59 +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
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
Ulya Trafimovich
c6ebb82b9f Update OWNERS.
Some people left, some new files were added.

Bug: 214255490
Test: none
Change-Id: I39a4b313ad69e2a2076a0dc87e131add5dc85b20
2022-04-29 13:51:31 +01:00
Ulya Trofimovich
4faef3876d Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." 2022-04-28 09:44:21 +00:00
Cole Faust
542399a8e8 Merge "Make mkstrip always return a string" 2022-04-27 21:37:25 +00:00
Cole Faust
63e1012b05 Merge "Send trace logs to stderr instead of stdout" 2022-04-27 16:50:10 +00:00
Treehugger Robot
7b90489e27 Merge "Add android.hardware.usb-V1 to vndk" 2022-04-27 16:21:29 +00:00
Treehugger Robot
b9b9c000d5 Merge "Add PLATFORM_VERSION_LAST_STABLE to soong config" 2022-04-27 13:00:36 +00:00
Ulya Trafimovich
30142ffc0a Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed.
Bug: 170935728
Test: lunch aosp_cf_x86_64_phone-userdebug && m && lunch_cvd
Change-Id: Icc50932228b6ce27799ac9ce9b2f637029436b6b
2022-04-27 13:32:04 +01:00
Anton Hansson
721a377982 Merge "Remove notice file for sdk system image" 2022-04-27 10:56:04 +00:00
Cole Faust
5e43109586 Make mkstrip always return a string
This is what mk2rbc assumes, and previously that
assumption was incorrect when passing a list to
mkstrip.

Bug: 226974242
Test: Presubmits
Change-Id: I7b1596662df7c966404aab2a99d7c2e53d917bd6
2022-04-26 15:30:20 -07:00
Cole Faust
c6024abe99 Send trace logs to stderr instead of stdout
Stdout gets redirected to a makefile that is
ingested by the rest of the build system.
The trace outputs were being mixed up with
the rest of the output, making them hard to
read. In addition, some of the trace output
wasn't commented out, so it was defining
make rules.

Fixes: 230495885
Test: Manually
Change-Id: I02f9038cd89598fc1c1561bf4bf2997ac090d9e9
2022-04-26 11:12:46 -07:00
Colin Cross
62bf0d5c88 Merge "Update PLATFORM_VERSION to UP1A" 2022-04-26 01:15:38 +00:00
Steven Moreland
6387caedc0 Merge "finalize_branch_for_release.sh: works w/ VNDK" 2022-04-25 17:50:16 +00:00
Martin Stjernholm
0f96329283 Merge "Add a product for building linux_bionic in --soong-only mode." 2022-04-25 16:54:49 +00:00
Anton Hansson
c3536674a9 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
Change-Id: Ib75b3e5919cd203e58e03efc1cb0a378283b0c34
2022-04-25 16:29:15 +01:00
Treehugger Robot
f3f9672549 Merge "[Bugfix] Check for presence before moving" 2022-04-25 11:13:48 +00:00
Inseob Kim
a59b4dcd33 Add PLATFORM_VERSION_LAST_STABLE to soong config
Bug: 189164487
Test: build
Change-Id: Iec36d22af80225f6da848bae1e02d263ff957df8
2022-04-25 18:20:36 +09:00
Badhri Jagan Sridharan
639593a3e4 Add android.hardware.usb-V1 to vndk
Bug: 200993386

Change-Id: Ibb328d9080c7879d9fc097039fcc9af18640937f
Merged-In: Ibb328d9080c7879d9fc097039fcc9af18640937f
(cherry picked from commit d67c8e4569)
2022-04-25 05:25:06 +00:00
Treehugger Robot
3ed2ad1bee Merge "sdk finalization script OWNERS smoreland@" 2022-04-23 07:06:45 +00:00
Steven Moreland
392499bd75 finalize_branch_for_release.sh: works w/ VNDK
When the freeze adds new libraries to the VNDK, we also need to
update the VNDK script.

Bug: 190577319
Test: run script on internal branch
Change-Id: I6f0ab177df5027ced0c4e198bb8a908da088eb85
2022-04-23 01:53:35 +00:00
Jooyung Han
94e79ece44 Merge "build_image: Support common args" 2022-04-23 01:34:30 +00:00
Steven Moreland
e95beadd9a sdk finalization script OWNERS smoreland@
Bug: 190577319
Test: N/A
Change-Id: I05e9f88deb6640f944145f00932405dea8e6b195
2022-04-22 22:08:34 +00:00
Treehugger Robot
5f6235e580 Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." 2022-04-22 19:52:05 +00:00
Colin Cross
37674b40b4 Update PLATFORM_VERSION to UP1A
Update PLATFORM_VERSION to UP1A.  The codename is now UpsideDownCake.

Bug: 219519679
Test: m checkbuild
Change-Id: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
Merged-In: I61db64b279e4e64c9be33095bf98b3bbdb0e19d8
(cherry picked from commit 29919e3b66)
2022-04-22 09:16:00 -07:00
satayev
e0a44065b1 Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES.
Bug: 220153433
Test: atest BuildTest
Change-Id: I24d73a846d14a032c1e03679cef10cfeac814bb9
Merged-In: I24d73a846d14a032c1e03679cef10cfeac814bb9
(cherry picked from commit da1e41d1f3)
2022-04-22 09:14:48 -07:00
Treehugger Robot
185a226bd5 Merge "finalize_branch_for_release.sh rel to root" 2022-04-22 03:07:24 +00:00
Treehugger Robot
8ecc6369f0 Merge "Use the new R8/D8_FLAGS vars" 2022-04-22 02:42:06 +00:00
Treehugger Robot
5b945cb354 Merge "Add owners for version_defaults.mk" 2022-04-21 23:58:04 +00:00
Steven Moreland
12071ac571 finalize_branch_for_release.sh rel to root
Bug: 228979367
Test: run script from root
Change-Id: I0a5cfd4873ccf49fd53be745d61005e821bfa80d
2022-04-21 22:43:54 +00:00
Jared Duke
1410f684f6 Use the new R8/D8_FLAGS vars
Propagate the new D8/R8 JVM flags vars that were formerly combined in
DEX_FLAGS.

Bug: 205303544
Test: time m
Change-Id: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
2022-04-21 18:24:55 +00:00
Jooyung Han
d9d0d69c4d build_image: Support common args
Even though build_image uses logger but there was no way to configure it
and even -v (verbose) didn't work.

common.ParseOptions() parses common arguments (e.g. -v -h --logfile).

Bug: n/a
Test: m
Test: build_image -v ... should print logs
Change-Id: I45a61ada9c6a5a616f05d3214e185d08b0f1c152
2022-04-22 01:59:33 +09:00
Iavor-Valentin Iftime
71585eae2b Merge "Rebuild and copy recovery and boot img when using vendor_otatools" 2022-04-21 16:07:12 +00:00
Lucas Wei
2d5ecef1b3 Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" 2022-04-21 03:07:15 +00:00
jiangxu5
2bd4273865 [Bugfix] Check for presence before moving
There are vendor products but no *.map situation

Signed-off-by: jiangxu5 <jiangxu5@xiaomi.com>
Change-Id: I5068abd1f81bca53ffcbdd415874b8fb49408e30
2022-04-21 09:33:31 +08:00
Treehugger Robot
d7856b74dc Merge "Declare license metadata for copied files." 2022-04-20 23:58:24 +00:00
Bassem Khalife
5dc6b582be Add owners for version_defaults.mk
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
2022-04-20 22:09:56 +00:00
Bob Badour
540a3f8ec1 Declare license metadata for copied files.
Bug: 151177513

Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Ivan Lozano
6689f3889e Merge "rust: Add proc_macro NOTICE files" 2022-04-20 19:21:25 +00:00
Treehugger Robot
f9fcd028df Merge "Add boot AVB key setting to GSI" 2022-04-20 18:55:53 +00:00
Steven Moreland
7a396db029 Merge "Start script to finalize branch release." 2022-04-20 18:45:26 +00:00
Treehugger Robot
8a6fa9c7c5 Merge "Allow init_rc files to be installed in ramdisk" 2022-04-20 18:07:17 +00:00
Lucas Wei
03230250a3 vendor_kernel_boot: Update releasetools for vendor_kernel_boot
add_img_to_target_files.py will re-make image and build a new
signed vbmeta.img with new images in target-file.
We need to add vendor_kernel_boot into AVB signing list and make it
support that image.

Test: make dist -j110 and check vbmeta.img
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id07433f3dc33f95e2edd49de890f1e098cb9ef31
2022-04-21 00:27:27 +08:00
Martin Stjernholm
2d068b59e6 Add a product for building linux_bionic in --soong-only mode.
Modelled after the mainline_sdk product.

Test: build/soong/soong_ui.bash --make-mode --soong-only \
        SOONG_ALLOW_MISSING_DEPENDENCIES=true \
        TARGET_PRODUCT=linux_bionic com.android.art.host
Bug: 31559095
Bug: 229123823
Change-Id: I6051d21cc4bae561e987561ddad5f1ec5435c4ca
2022-04-20 16:58:29 +01:00
Trevor Radcliffe
1e63a893dc Merge "Add comment for previous CL" 2022-04-20 14:16:22 +00:00
SzuWei Lin
97064c53ff Add boot AVB key setting to GSI
Signing tool assumes GSI targets has boot.img and get error without
these settings.

Bug: 229814765
Change-Id: I1e8e7f6375e396e1c2feb858b97e7d27dc5a2dec
2022-04-20 07:20:45 +00:00
Treehugger Robot
9ec1a7aa72 Merge "Correct abspath implementation" 2022-04-20 01:32:16 +00:00
Treehugger Robot
0339142a27 Merge "Sort inherited products correctly" 2022-04-20 01:09:36 +00:00
Steven Moreland
3549659a1c Start script to finalize branch release.
To put in CI. At the end of every Android release, we need
to do 100,000 things to get the release ready. The process
to finalize the release for AIDL interfaces is automated now,
so we're adding a generic script. The goal is:

    1. gradually add more pieces of the finalization process
       which can be automated (VNDK, SDK, etc...)
    2. when problems happen, we can fix them in real time in CI
    3. once the entire release process is in CI, we can optimize
       it, and we can require that new requirements on the
       Android release process come with a script to satisfy them.

Until then, this script will be used to test the automated parts
of the release process in CI.

Bug: 190577319
Bug: 228979367
Test: ./build/make/finalize_branch_for_release.sh (in the T release branch)
Change-Id: Ie9ff42dd4c6e86d395bde3f14788029e5bde5fb2
2022-04-19 23:47:08 +00:00