Commit graph

67328 commits

Author SHA1 Message Date
Treehugger Robot
a5dcac761f Merge "Turn missing jarjar output files into errors" 2021-02-08 22:00:02 +00:00
Julien Desprez
c11f680b07 Merge "Clean TEST_MAPPING config based on go/a-unit-tests" am: 1514b9a581
Original change: https://android-review.googlesource.com/c/platform/build/+/1574711

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a3812bd2494d218ea7f756b5b90cd0841b59ad7
2021-02-08 21:37:45 +00:00
Julien Desprez
1514b9a581 Merge "Clean TEST_MAPPING config based on go/a-unit-tests" 2021-02-08 21:25:05 +00:00
Treehugger Robot
90bd66aad9 Merge "Remove Use_lmkd_stats_log from build" am: c5bbb1ead1
Original change: https://android-review.googlesource.com/c/platform/build/+/1579530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8698d82da31a5d52d0161b307f30e8a75e99306
2021-02-08 21:06:38 +00:00
Treehugger Robot
c5bbb1ead1 Merge "Remove Use_lmkd_stats_log from build" 2021-02-08 20:58:19 +00:00
Treehugger Robot
38aea6ebe4 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" am: 7ef7116014
Original change: https://android-review.googlesource.com/c/platform/build/+/1578147

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4449c53ee87eaefaf9be7ef202e8735995fb4b24
2021-02-08 20:52:01 +00:00
Treehugger Robot
7ef7116014 Merge "Keystore 2.0: Disable keystore 2 by default (for now)" 2021-02-08 20:04:38 +00:00
Colin Cross
a1271eb343 Turn missing jarjar output files into errors
Jarjar doesn't exit with a nonzero return code when there is a syntax
error in a rules file and doesn't write the output file.  Without a
nonzero return code ninja prints a warning but continues, which leads
to stale results on incremental builds where the output file already
exists, or delayed errors on clean builds whre the output file didn't
exist.

Delete the output file before running jarjar, and then check if it
exists after running jarjar.

Fixes: 119516143
Test: m out/target/common/obj/JAVA_LIBRARIES/noto-emoji-compat-java_intermediates/classes-jarjar.jar
Change-Id: Ib99167403948ee11f039dd4d2d7e63052bb92136
2021-02-08 10:55:05 -08:00
Ioannis Ilkos
8e568c52ab Remove Use_lmkd_stats_log from build
Use_lmkd_stats_log used to control LMKD_LOG_STATS when compiling lmkd.

However, for newer Android releases, we mandate that lmkd informs statsd of process kills (change id I8cb123b9488fbc6e88863c2f0e75f1422bcd282e)
After aosp/1555318 we compile lmkd with statsd by default, so this setting is a noop.

Change-Id: I91bd08198fe2275fb8aca77ae5ea637df360d416
Test: build
Bug: 177985094
2021-02-08 11:17:55 +00:00
Yo Chiang
ecaa592310 Set PRODUCT_SHIPPING_API_LEVEL in gsi_release.mk
Set PRODUCT_SHIPPING_API_LEVEL to the latest value (instead of empty) so
that GSIs are always built with the latest build system default configs,
such as PRODUCT_FULL_TREBLE := true and
PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true.

Bug: 177495407
Test: Presubmit build_test
Change-Id: Iabd67656c5ed1de8327c40f0f9f604841f24764b
2021-02-08 12:45:15 +08:00
Kelvin Zhang
bbfa182995 Add flag to manually disable vabc
Test: ota_from_target_files --disable_vabc
Change-Id: I9ae9ce2c3173909c335708329e787ae45dc5da6b
2021-02-07 10:43:15 -05:00
cfig
791378cda1
extract_kernel: make it py2/py3 compatible
use py3 for AOSP build, while the script itself can be
executed under py2/py3 environment directly.

TEST: extract info from Pixel 4 kernel

Change-Id: I00db6dabb1ff93f0758017a666c476816caefae7
2021-02-07 17:05:53 +08:00
Treehugger Robot
c29df1c8d1 Merge "Adding repack_bootimg into otatools.zip" am: bff5273dd0
Original change: https://android-review.googlesource.com/c/platform/build/+/1576989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bea6fab99d2fe54f8ff14130a93087fcfe3a4e4
2021-02-06 08:28:24 +00:00
Treehugger Robot
bff5273dd0 Merge "Adding repack_bootimg into otatools.zip" 2021-02-06 08:00:55 +00:00
Janis Danisevskis
a3c5395672 Keystore 2.0: Disable keystore 2 by default (for now)
Test: System starts without keystore 2 running.
Bug: 160623310
Change-Id: I83d54de602a0f70acc91fd8e55b07706e1b4e55b
2021-02-05 14:39:43 -08:00
Colin Cross
c5af7ef2bd Merge "Use RSP file for soong_zip in target_files.zip" am: effaa0414b
Original change: https://android-review.googlesource.com/c/platform/build/+/1573860

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85b8ae001ab1f2a1bc62405991621dff0b6058c0
2021-02-05 21:54:46 +00:00
Colin Cross
effaa0414b Merge "Use RSP file for soong_zip in target_files.zip" 2021-02-05 21:33:37 +00:00
Treehugger Robot
519547ea53 Merge "GSI: enable dynamic partitions" am: e174dca416
Original change: https://android-review.googlesource.com/c/platform/build/+/1576992

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ac305fda8a1470f7d4c8f42f86d3391bd1405b1
2021-02-05 18:59:27 +00:00
Treehugger Robot
e174dca416 Merge "GSI: enable dynamic partitions" 2021-02-05 18:34:38 +00:00
Jeongik Cha
de2d7b11e6 update vndk list
Bug: 150578172
Test: m
Change-Id: Ifc160fc225883cc226bfcbacc8607f6f96d9501a
Merged-In: I76e73668faf248ca33a37eb221973d2164d9c9b8
2021-02-05 10:05:49 -08:00
Treehugger Robot
83d70e8b9c Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." am: 530b39afc9
Original change: https://android-review.googlesource.com/c/platform/build/+/1570740

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2614febe66e93d485912f85488b2b1394e68f23
2021-02-05 14:22:13 +00:00
Treehugger Robot
530b39afc9 Merge "Add logic to ensure the ART APEXes are built from source in coverage builds." 2021-02-05 13:49:53 +00:00
Ulyana Trafimovich
14bd7995f9 Merge "Don't patch build path to DEX jar in dex_preopt_config_merger.py." am: 966928196d
Original change: https://android-review.googlesource.com/c/platform/build/+/1574724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e5429dbf32b90ef3ee20b1299d9891da6dd6deb
2021-02-05 11:50:59 +00:00
Ulyana Trafimovich
966928196d Merge "Don't patch build path to DEX jar in dex_preopt_config_merger.py." 2021-02-05 11:10:03 +00:00
Hung-ying Tyan
4ae09765b7 GSI: enable dynamic partitions
to facilitate mixing GSI onto Cuttlefish

Bug: 178677060
Bug: 179455901
Test: build gsi_x86_64 and aosp_arm64 and check the existence of
      'dynamic_partition_list' in misc_info.txt

Change-Id: I0fd9e9645d4882e2cd7d3508a44fbcad5dce81bc
2021-02-05 18:50:28 +08:00
Bowgo Tsai
6c37c172c6 Adding repack_bootimg into otatools.zip
repack_bootimg is useful to add files into a ramdisk, then repack
a boot.img. Note that mkbootimg, unpack_bootimg, lz4, minigzip, etc.,
that repack_bootimg depends are already in otatools.zip.

Bug: 174443192
Test: `m otatools-package`, unzip $OUT/otatools.zip, export $PATH
      with ./otatools/bin and checks unpack_bootimg can run
Change-Id: Id4fbf2076b50522b95ab46dfeb1e2b7115d6606d
2021-02-05 18:14:34 +08:00
Yi-Yo Chiang
c12dd84d01 Kernel modules: add modules.blocklist build support
BOARD_<partition>_KERNEL_MODULES_BLOCKLIST_FILE<kernel_version> checks
the syntax of and installs a prebuilt modules.blocklist file.

Example usage:
```
BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := \
  $(wildcard <path to prebuilt modules.blocklist>)
```

Then the modules blocklist would be install to
(vendor|vendor_dlkm)/lib/modules/modules.blocklist.

Bug: 175165656
Test: Create a blocklist with incorrect syntax, verify build fails
Test: Verify the new macro indeed installs the blocklist file
Change-Id: Icb75aae1bdb45546792f28f4c4e8d06d9439391a
2021-02-05 16:28:34 +08:00
Yan Yan
ab282be1c7 Add IKE to bcp and remove it from system server classpath
Bug: 177266501
Test: builds
Change-Id: I90df69a4b892a3faab8097111756c1f42c4cfb68
Merged-In: I90df69a4b892a3faab8097111756c1f42c4cfb68
2021-02-04 23:33:43 -08:00
Benjamin Schwartz
2430e7e3a3 powerstats: PowerStats HAL has been renamed
Bug: 169864180
Test: m
Change-Id: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
(cherry picked from commit 75a532279d)
Merged-In: I1a1680d94bda3a97f4a5c074ba47a7e57e1241ad
2021-02-04 16:51:37 -08:00
Benjamin Schwartz
0cca4d0211 Create Power Stats AIDL interface
Bug: 162472196
Test: m
Change-Id: I195ace557e1db2894d12f6f15d4db494d358c8e8
Merged-In: I195ace557e1db2894d12f6f15d4db494d358c8e8
2021-02-04 16:01:46 -08:00
android-build-team Robot
b5290f8271 Version bump to RQ2A.210305.007 [core/build_id.mk]
Change-Id: I196a6acebe0e40411bccb96da8e475c8dea94b1a
2021-02-04 22:27:50 +00:00
Bill Yi
5a39095fbc [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 250a0420ea -s ours
am skip reason: Change-Id Ibf5ea0aaf1cf42c08f32e435b1164598410ac44a with SHA-1 697af28902 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac87d5dab930ef340177597363dbb74ae8b86011
2021-02-04 18:19:20 +00:00
Julien Desprez
0c09471cc3 Clean TEST_MAPPING config based on go/a-unit-tests
unit_tests:true do not need TEST_MAPPING files

Test: presubmit
Bug: 178646865
Change-Id: Id36e98ce661dc2052e333b2644202361127939a5
2021-02-04 09:12:05 -08:00
Bill Yi
250a0420ea Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +00:00
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