Commit Graph

67344 Commits

Author SHA1 Message Date
Ulya Trafimovich 38cd0624f3 Don't patch build path to DEX jar in dex_preopt_config_merger.py.
The initial path value is correct, there's no need to patch it.

Bug: 132357300
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 grep output, no errors
Change-Id: Iaa9171e7db348ad469ec56b977b5f2226f353284
2021-02-04 09:55:57 +00:00
Ulyana Trafimovich eecfaea74a Merge "Quick and dirty filtering of present LOCAL_OPTIONAL_USES_LIBRARIES." am: 015fd9e71b
Original change: https://android-review.googlesource.com/c/platform/build/+/1570741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If30e626e61596fe80ad500b5c2fcd85bee64cd24
2021-02-04 06:51:25 +00:00
Ulyana Trafimovich 015fd9e71b Merge "Quick and dirty filtering of present LOCAL_OPTIONAL_USES_LIBRARIES." 2021-02-04 06:16:03 +00:00
Bill Yi 3248ef4e4f Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: Ibf5ea0aaf1cf42c08f32e435b1164598410ac44a
Merged-In: I155689df9ad55e5056baebe975ee14f2d2622cef
Change-Id: Iaa90ab536a2fa336db81e3af04648ce68f138cab
2021-02-03 17:01:38 -08:00
Colin Cross 17e98b7ca2 Use RSP file for soong_zip in target_files.zip
target_files.zip passes a list of files to soong_zip in a file list
file, which soong_zip interprets as a glob.  Adding a file called "["
causes soong_zip to error with "syntax error in pattern".  Use an RSP
file instead, which after I1de7829c668538204fc4a2ac793a4f88dbc886c9
does not interpret entries as globs.

Bug: 179297188
Test: m target-files-package
soong_zip: don't glob RSP file entries

File arguments are considered globs, but RSP file entries should be
considered filenames without globbing.  Escape RSP file entries so
they don't get treated as globs later.

Bug: 179297188
Test: zip_test.go
Change-Id: I0736f2d1802114217cba03ee32b67479c9d98da8
2021-02-03 16:03:55 -08:00
Martin Stjernholm 7704497315 Add logic to ensure the ART APEXes are built from source in coverage
builds.

This CL is a nop since the default is still true, but it gives us a way
to toggle it without affecting coverage builds.

Test: env NATIVE_COVERAGE=true build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
      env CLANG_COVERAGE=true build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
      env NATIVE_COVERAGE=true CLANG_COVERAGE=true \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  check that all these print "true" when the default in the "else"
  clause is "false".
Bug: 172480615
Change-Id: I648ed911773c59a5b2a117dbf3ddcb2ef338830d
2021-02-03 23:16:01 +00:00
Martin Stjernholm 2e6a0e59d4 Merge "Merge the module_* device.mk files into their corresponding product mk files." am: c7e1bdfede
Original change: https://android-review.googlesource.com/c/platform/build/+/1570300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750580d5b075294f441f8fac2ab651a289cb400c
2021-02-03 16:32:57 +00:00
Martin Stjernholm c7e1bdfede Merge "Merge the module_* device.mk files into their corresponding product mk files." 2021-02-03 16:12:34 +00:00
Ulya Trafimovich 156c719179 Quick and dirty filtering of present LOCAL_OPTIONAL_USES_LIBRARIES.
Filter LOCAL_OPTIONAL_USES_LIBRARIES by PRODUCT_PACKAGES. This has the
drawback that some present libraries may be filtered out as well, as the
full list of product packages is unknown until all Android.mk files have
been read.

This CL unblocks <uses-library> fixes for individual apps, which will be
necessary to dexpreopt them in the nearest future when the &-classpath
hack is removed in ART. Apps that are not fixed by then will loose
dexpreopt completely. This fix, although not perfect, lowers the risk of
loosing dexpreopt for many apps. In the future it may be replaced with a
better solution.

Bug: 132357300
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 grep output, no errors
Change-Id: I188cf240259f7a448623450e6a949e0784a21f87
2021-02-03 15:05:42 +00:00
Inseob Kim 05d595194b Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish
device/generic/goldfish/sepolicy/common/property_contexts still contains
violations, so temporarily setting build_broken to relax vendor property
check.

Bug: 176210699
Test: m vendor_property_contexts
Change-Id: Ia7d7830a7e994fd0766fd8854524bb6f9fa5cce6
2021-02-03 18:35:37 +09:00
Inseob Kim 43f4ef0221 Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig
Bug: 175526482
Test: m vendor_property_contexts after making violations
Change-Id: I81512fefbe952ecaf31fd4b5d276fd32c6253c7f
2021-02-03 18:17:49 +09:00
Treehugger Robot 2067544847 Merge "Install init_rc for recovery modules correctly." am: 1d77ebad18
Original change: https://android-review.googlesource.com/c/platform/build/+/1571052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56fe7d7f01e47337f30b15ed7fc693c681377063
2021-02-03 08:35:07 +00:00
Treehugger Robot 1d77ebad18 Merge "Install init_rc for recovery modules correctly." 2021-02-03 07:35:04 +00:00
Inseob Kim a0884b90ae Add PRODUCT_SHIPPING_API_LEVEL to productVariables
Bug: 175526482
Test: m selinux_policy
Change-Id: I10195730e47398bdb455d554a1cb7d6b7ac28634
2021-02-03 16:23:42 +09:00
Yifan Hong 83d1c2ed4b Install init_rc for recovery modules correctly.
If a module is installed to TARGET_RECOVERY_ROOT_OUT,
then its init rc file (declared in LOCAL_INIT_RC) is installed
to $OUT/recovery/root/system/etc/init instead of
$TARGET(partition)_OUT_ETC/init.

Fixes: 178859897
Test: m snapuserd.recovery

Change-Id: I82d0f40d6d7047e271612204391c5a027f84f52f
2021-02-02 17:04:53 -08:00
android-build-team Robot 9e2d21f913 Version bump to RQ2A.210305.006 [core/build_id.mk]
Change-Id: Ib6b8ab30e7fe756e52258ac3182a640dcd738435
2021-02-03 01:00:57 +00:00
Bill Yi c0a7364206 Merge "Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2021-02-03 01:00:39 +00:00
Kelvin Zhang 697af28902 Merge "Fix test failures due to binaries not found in PATH" am: 00db3859e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1564575

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf5ea0aaf1cf42c08f32e435b1164598410ac44a
2021-02-02 23:06:53 +00:00
Kelvin Zhang 00db3859e7 Merge "Fix test failures due to binaries not found in PATH" 2021-02-02 22:21:15 +00:00
Kelvin Zhang ef8b513cba Merge "Add releasetools_test to TEST_MAPPING" am: e9d4ddb1e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1568040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I388f37ed75b15452abe2db3dfeff030e48194503
2021-02-02 20:07:19 +00:00
Kelvin Zhang daec103311 Merge "Add deapexer to releasetools_common" am: 6c5d977b2e
Original change: https://android-review.googlesource.com/c/platform/build/+/1567840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bbb36949a01f2294a84aa01b86002bcdd159b25
2021-02-02 19:50:34 +00:00
Kelvin Zhang e9d4ddb1e0 Merge "Add releasetools_test to TEST_MAPPING" 2021-02-02 19:25:21 +00:00
Kelvin Zhang 05a3f680f7 Fix test failures due to binaries not found in PATH
Test: rm `where deapexer` && mm otapackage

Change-Id: I0b742f26ae984729b97bf796aa3ed9335b316369
2021-02-02 14:24:54 -05:00
Kelvin Zhang 553efcaae2 Add releasetools_test to TEST_MAPPING
Test: treehugger
Change-Id: I3a0f9e9e5dd8d49c22f466aa0605768fee3f4821
2021-02-02 14:24:54 -05:00
Kelvin Zhang 6c5d977b2e Merge "Add deapexer to releasetools_common" 2021-02-02 19:16:49 +00:00
Jeff Vander Stoep 1431ab8cf9 envsetup: add rgrep for local Rust files
Test: cd external/rust/crates
    rgrep test
Change-Id: I69fa770742c0dc20259346acaf1184c19675b3a7
2021-02-02 19:18:26 +01:00
Bill Yi 20f243849e Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I2978c6f188fa68ec283d3a46487e588f39a84924
Change-Id: I07badac5de201532ba52dc0b8fe77676b11e608a
2021-02-02 09:54:37 -08:00
Ulyana Trafimovich 5ccd83d2c0 Merge "Fix typo in variable name." am: 8aaf4ac383
Original change: https://android-review.googlesource.com/c/platform/build/+/1570340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89a34a902eeb6954180a9d1b8718281aa82ec37a
2021-02-02 17:15:08 +00:00
Ulyana Trafimovich 8aaf4ac383 Merge "Fix typo in variable name." 2021-02-02 16:46:25 +00:00
Ulya Trafimovich c77a379241 Fix typo in variable name.
Bug: 132357300
Test: m nothing
Change-Id: I0e770aa7ab179aa90ae0d12d7c101e65ca345bee
2021-02-02 12:22:04 +00:00
Martin Stjernholm 4ca749cb11 Merge the module_* device.mk files into their corresponding product mk
files.

To clean up an unnecessary indirection. Instead introduce a common file
for module products.

Test: lunch module_{arm,arm64,x86,x86_64}
      inspect the build banners
Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51
2021-02-02 11:32:25 +00:00
Mohammad Samiul Islam f4909b4d71 Add deapexer to releasetools_common
Bug: 178726093
Test: m updatepackage
Change-Id: I74650f339ab5399c2474d7cde1d290b55dab721c
2021-02-01 21:03:58 +00:00
Ulyana Trafimovich 56ca1f405b Merge "Merge <uses-library> dependency configs into dexpreopt.config files." am: d04a95a97f
Original change: https://android-review.googlesource.com/c/platform/build/+/1541772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic112df3d73af168ebb99a648e4ded2a0acc04390
2021-02-01 10:39:30 +00:00
Ulyana Trafimovich d04a95a97f Merge "Merge <uses-library> dependency configs into dexpreopt.config files." 2021-02-01 10:16:57 +00:00
android-build-team Robot f38e5869be Version bump to RQ2A.210305.005 [core/build_id.mk]
Change-Id: I895b6d26ecfad502bf07458eedf53e6bc0298af4
2021-01-30 00:20:47 +00:00
Treehugger Robot b87559a800 Merge "Add top level product definitions for module_* devices." am: 289a0ffdaf
Original change: https://android-review.googlesource.com/c/platform/build/+/1561960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa512a3f4dc635e14dd5d180ed3019e9de5c3aa9
2021-01-29 21:58:32 +00:00
Treehugger Robot b2be579840 Merge "Only add apex_info for compressed apexes" am: 472a860bee
Original change: https://android-review.googlesource.com/c/platform/build/+/1562632

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8f6a14269b7b6883d886dcf4aa5ce5f4665cfe3
2021-01-29 21:57:28 +00:00
Colin Cross 83643f0147 Merge "Add armv8-a-branchprot arch variant" am: a6f77c11e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1563733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3785f478dd309efbe06f641df4fbff777d4f8c1
2021-01-29 21:56:53 +00:00
Treehugger Robot 289a0ffdaf Merge "Add top level product definitions for module_* devices." 2021-01-29 18:52:25 +00:00
Treehugger Robot 472a860bee Merge "Only add apex_info for compressed apexes" 2021-01-29 10:34:21 +00:00
Colin Cross a6f77c11e0 Merge "Add armv8-a-branchprot arch variant" 2021-01-29 01:20:08 +00:00
Tamas Petz 1c879b8822 Add armv8-a-branchprot arch variant
This empty file is required to be present.

Test: fvp_mini-eng* builds and boots on FVP

*: with TARGET_ARCH_VARIANT := armv8-a-branchprot

Change-Id: I689033f16663822e263f45ab5e46c9f120c9dca0
2021-01-28 17:10:24 +01:00
Ulya Trafimovich 558cb6c5ac Merge <uses-library> dependency configs into dexpreopt.config files.
Since Make does not visit modules in topological order of their
<uses-library> dependencies, information from dependencies to the
dexpreopted module has to be passed via dexpreopt.config files. A build
rule for a dexpreopt.config file depends on dexpreopt.config files for
<uses-library> dependencies, and dex_preopt_config_merger.py script
extracts the necessary information from dependency configs and patches
the module's config.

Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: Id0b71170a4d2ab1d33059de0e9ad9d7e61f2345e
2021-01-28 14:59:14 +00:00
Nikita Ioffe 8db515e2be Merge "Add support for signing a compressed apex" am: 8e0c592f89
Original change: https://android-review.googlesource.com/c/platform/build/+/1554834

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24adfbfd6c311a6295a3865c6ccfb39672691977
2021-01-27 21:53:13 +00:00
Martin Stjernholm 29c5d1a4f1 Add top level product definitions for module_* devices.
Test: lunch module_{arm,arm64,x86,x86_64}
  Inspect target arches in the banner
Bug: 176171716
Change-Id: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb
2021-01-27 20:29:19 +00:00
Nikita Ioffe 8e0c592f89 Merge "Add support for signing a compressed apex" 2021-01-27 19:45:33 +00:00
Kelvin Zhang c72718c7c5 Only add apex_info for compressed apexes
Test: mm -j dist, then make sure apex_info.pb doesn't contain
non-compressed apex

Change-Id: I6262eb97ec53de28953257d8b3b77e32ac0259be
2021-01-27 14:17:14 -05:00
Kelvin Zhang bf817c9f05 Merge "Add apex_info.pb to generated OTA" am: a7f2857f8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1556919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78db36c2dc76e1c01153dda01673aa05041b80d6
2021-01-27 15:48:05 +00:00
Kelvin Zhang a7f2857f8b Merge "Add apex_info.pb to generated OTA" 2021-01-27 14:58:30 +00:00
Kelvin Zhang 1f6c6a172f Merge "Fix pylint warnings on ota_from_target_files.py" am: c25182c757
Original change: https://android-review.googlesource.com/c/platform/build/+/1556918

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3481b2a8c9b66e0e5eb1d5dee26c5f5c17db033e
2021-01-27 02:28:45 +00:00