Commit graph

59649 commits

Author SHA1 Message Date
Roland Levillain
14323e5cf0 Introduce product variables to select Java code coverage paths in Make.
Introduce product variables `JavaCoveragePaths` and
`JavaCoverageExcludePaths` (resp. populated from environment variables
`JAVA_COVERAGE_PATHS` and `JAVA_COVERAGE_EXCLUDE_PATHS`). Use them to
control which Java modules are candidate for instrumentation based on
their source path. By default (when `JavaCoveragePaths` is empty),
have all Java modules be candidate for instrumentation, to preserve
the existing behavior.

Test: export EMMA_INSTRUMENT=true \
        && export EMMA_INSTRUMENT_FRAMEWORK=true \
        && export JAVA_COVERAGE_PATHS=art \
        && m
Bug: 158212027
Bug: 156284897
Merged-In: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
2020-06-29 18:01:25 -07:00
Roland Levillain
bdb1b4c79a Rename native code coverage paths product variables in Make.
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Merged-In: I409dbb04b09744a7bd95a4b69361e858b9f89e23
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
(cherry picked from commit bad8b386e6)
2020-06-29 17:54:08 -07:00
TreeHugger Robot
30d5c93f47 Merge "Switch to using llvm-strip for modules" into rvc-dev 2020-06-23 20:17:52 +00:00
Jooyung Han
cd1aaed4f0 Merge "GSI: install flattened cts shim" into rvc-dev 2020-06-22 17:05:58 +00:00
J. Avila
74d50ccb69 Switch to using llvm-strip for modules
The gcc tools are deprecated; replace with the llvm equivalent.

Bug: 158484106
Merged-In: I9c3717bde281667eec82cc21dc63dc7fd5592a46
Change-Id: I9c3717bde281667eec82cc21dc63dc7fd5592a46
2020-06-22 15:31:27 +00:00
Jooyung Han
15f9085595 GSI: install flattened cts shim
The flattened version of com.android.apex.cts.shim.v1 should be
explicitly installed because the shim apex is prebuilt one and
PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES is not supported for
prebuilt_apex modules yet.

Bug: 158169437
Bug: 159392784
Test: m com.android.apex.cts.shim.v1_with_prebuilts.flattened
      # should install the prebuilts of shim APKs
Change-Id: I8b37a320d2130d7b33aca856bc067dce37d1fb30
2020-06-19 20:09:06 +09:00
Chen Xu
99e317ce2d Merge "Do not include CellBroadcastLegacy for Go devices" into rvc-dev 2020-06-19 05:49:39 +00:00
TreeHugger Robot
b8f8fc6a88 Merge "iorap: Turn off pinner by default for large memory devices." into rvc-dev 2020-06-19 03:20:24 +00:00
TreeHugger Robot
22f98f1885 Merge "notice files in system_other becomes included in system's one" into rvc-dev 2020-06-19 01:23:26 +00:00
yawanng
77107a17e5 iorap: Turn off pinner by default for large memory devices.
Bug: 157667363
Test: Make
Change-Id: I980a470596da3bf4e500bbd6c517e1a022c2d1a0
2020-06-19 00:47:17 +00:00
Chen Xu
ced4dd2d99 Do not include CellBroadcastLegacy for Go devices
CellBroadcastLegacy app is for migrating data from pre-mainline world.
Go devices do not take mainline module, thus excluding this apk
from build. Otherwise, both CellBroadcastLegacy app and
CellBroadcastAppPlatform will have the same package name
com.android.cellbroadcastreceiver

Bug: 157702986
Test: build go target:  walleye_svelte-userdebug
Change-Id: I254a8af334580b79ffdbc9e8bfa95b23500f507e
2020-06-18 15:41:23 -07:00
TreeHugger Robot
aec1debc65 Merge "Skip mount /oem on GSI" into rvc-dev 2020-06-18 15:32:41 +00:00
Paul Duffin
c5fd7066f5 Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev 2020-06-18 12:16:47 +00:00
Jeongik Cha
9917520fc2 notice files in system_other becomes included in system's one
system_other is relevant partition to system over vendor.
so move notice files from system_other from vendor to system

Bug: 159189171
Test: m nothing && check ninja dependency
Change-Id: Ib69bd3faae03f174671d5db8366a59b7d28a9d9d
2020-06-18 20:44:51 +09:00
Jing-yan, Jang
dd592d87ec Merge "Identity: Add credstore" into rvc-dev 2020-06-18 06:47:03 +00:00
TreeHugger Robot
ddca499c5c Merge "Remove ANGLE from base_system.mk" into rvc-dev 2020-06-17 20:34:06 +00:00
Tim Van Patten
25db69a401 Remove ANGLE from base_system.mk
Removing GoogleANGLE only removed the Google-signed version of ANGLE,
but the AOSP version still remained. This CL removes the AOSP build of
ANGLE also, so there is no ANGLE on the device at all.

Bug: 158956138
Test: adb shell pm list packages | grep -i angle
Change-Id: If9a42bc6436c752d2b1a16565d99ca2a5ec60d66
2020-06-17 12:38:25 -06:00
TreeHugger Robot
f854cf8317 Merge "enable LZ4 ramdisks for aosp_arm64" into rvc-dev 2020-06-17 17:51:25 +00:00
Paul Duffin
92d41de8f2 Fail check-boot-jars if boot jar contains 0 .class files
Protect against an invalid boot jar, e.g. one containing .dex files is
used instead of .class files.

Test: add a prebuilt for framework-tethering
      Run `m check-boot-jars` with the first fix from
	  https://r.android.com/1341756 and the build fails due to no
	  .class files because a dex jar is used.
	  Run `m check-boot-jars` with all fixeds from
	  https://r.android.com/1341756 and the build works.
Bug: 158304459
Bug: 159112414
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
2020-06-17 17:38:24 +01:00
Steve Muckle
a6da7bc44a enable LZ4 ramdisks for aosp_arm64
LZ4 is much faster to decompress than gzip.

Bug: 158791155
Change-Id: Id962c439c54e8c4fcca003acad3b7e09d1dec424
2020-06-17 09:00:51 -07:00
SzuWei Lin
03a29a6974 Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
Merged-In: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
(cherry picked from commit f8475cc49f)
2020-06-17 18:18:20 +08:00
TreeHugger Robot
d9673e768a Merge "add 4.19 kernel to aosp_arm64" into rvc-dev 2020-06-17 02:58:06 +00:00
Steve Muckle
9c4a0ea67f add 4.19 kernel to aosp_arm64
Create a 4.19 kernel GKI boot image.

Bug: 158791155
Change-Id: I2dcfe29f2e8414c0362992a6e6ca68a86f367d4e
2020-06-16 17:49:18 -07:00
TreeHugger Robot
6df396f96f Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev 2020-06-17 00:46:40 +00:00
Tianjie Xu
21c7d8c5c6 Merge "Fix the read on a closed zipfile" into rvc-dev 2020-06-17 00:02:53 +00:00
josephjang
f829b2bc9f Identity: Add credstore
In order to support mDL on RVC, we need to
add credstore in /system/bin

Bug: 136506289
Test: atest VtsHalIdentityTargetTest
Change-Id: I7975eddde5b94edcd3a2d0e213244f84ffe43e8d
2020-06-16 14:04:00 +00:00
Colin Cross
7244e60105 Merge "Use inclusive language in build/make" into rvc-dev 2020-06-16 03:28:15 +00:00
Colin Cross
2be0200a8b Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev 2020-06-16 03:27:32 +00:00
Roopesh Nataraja
1908f97319 Include image descriptor of only the first boot image in vbmeta
Multiple boot images can be generated based on BOARD_KERNEL_BINARIES
but vbmeta would capture the image descriptor of only the first boot
image specified in BUILT_BOOTIMAGE_TARGET.

Bug : 158213759
Test: Compile multiple boot images and check if vbmeta.img
      includes image descriptor of only the first boot image
      specified in BUILT_BOOTIMAGE_TARGET

Change-Id: Ib70f65d98546a436da82656bc5c911d437618bb5
Merged-In: Ib70f65d98546a436da82656bc5c911d437618bb5
2020-06-15 17:10:56 -07:00
TreeHugger Robot
2e2cb808cb Merge "Add test config template for sh_test." into rvc-dev 2020-06-15 16:37:06 +00:00
Tianjie
17f6ed8b04 Fix the read on a closed zipfile
When calculating the dynamic fingerprints, we need to reopen the
input file if it's a ZipFile. Because the original object has been
closed, as its scope ends after the with statement.

Bug: 152167826
Test: generate an OTA package with zip input and overrides
Change-Id: I623da3cc5fcc91c6230fb5a6e86517ed995913b7
(cherry picked from commit eb06afb602)
2020-06-13 14:35:14 -07:00
Colin Cross
a1383d8f9d Use inclusive language in build/make
Bug: 158889297
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
Merged-In: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
(cherry picked from commit c3ad80467e)
2020-06-12 21:10:55 -07:00
Colin Cross
3cd4a076ba Add out/soong/late-${TARGET_PRODUCT}.mk
Read out/soong/late-${TARGET_PRODUCT}.mk after reading Android.mk files
to allow Soong's makevars singleton to use $(call dist-for-goals).

Bug: 153485543
Test: m lint-check dist
Change-Id: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
Merged-In: I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0
(cherry picked from commit 8ca4092ab4)
2020-06-12 21:07:51 -07:00
Dan Willemsen
458af2daa1 Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET
Instead of copying the logic (which led to divergences), use the
same list of dependencies for both users of build-recoveryimage-target

Bug: 158774198
Test: treehugger
Test: build-coral.ninja is the same before/after
Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Merged-In: I8f8c006432f3b8120df1f39c98009155fdff32ad
(cherry picked from commit d120ac68fa)
2020-06-12 12:26:37 -07:00
frankfeng
e56f07725b Add test config template for sh_test.
Verification of compatibility with existing sh_test targets is in progress.

Bug: 148805488
Bug: 151761373

Test: make
Test: unit tests
Test: verified test config auto-gen for bc-tests and toybox-tests
Change-Id: Id8ce5dd0723e8c95921e2e20bff72fc828d47d87
Merged-In: Id8ce5dd0723e8c95921e2e20bff72fc828d47d87
2020-06-11 22:57:48 +00:00
TreeHugger Robot
0ffb2a8265 Merge "iorap: Move the pinner property to product/build.prop" into rvc-dev 2020-06-11 22:31:22 +00:00
TreeHugger Robot
c59ba8dab0 Merge changes If99c31cc,I41fb7611,Ia2ec8b29 into rvc-dev
* changes:
  base_rules.mk optimizations
  More performance improvements
  Rewrite test data logic to make it faster
2020-06-11 21:33:15 +00:00
TreeHugger Robot
1455b76f9f Merge "Add LZ4 support to the release tools" into rvc-dev 2020-06-11 18:41:19 +00:00
J. Avila
d30b751838 Add LZ4 support to the release tools
The core android build platform has changed to add support for LZ4
compression for ramdisks, but the release tools were not. Fix this.

Bug: 156129966
Merged-In: I39680b91930d2d3cbd0cd565beb78e1ee699397e
Change-Id: I39680b91930d2d3cbd0cd565beb78e1ee699397e
2020-06-11 15:22:04 +00:00
Dan Willemsen
91afa94150 base_rules.mk optimizations
A few more misc improvements that I found while analyzing the
performance of base_rules.mk.

This brings an aosp-master/aosp_crosshatch-userdebug kati run from 33.3s
to 28.6s

Bug: 158488548
Test: build-aosp_crosshatch.ninja is the same before/after
Change-Id: If99c31cc7b5d7133d70eb644c6095f19060b71e5
Merged-In: If99c31cc7b5d7133d70eb644c6095f19060b71e5
(cherry picked from commit 8447b8116a)
2020-06-10 17:18:20 -07:00
Dan Willemsen
74a1a483fc More performance improvements
Instead of using `x := $(x) foo`, make sure `x` is initialized first,
then use `x += foo`.

For a aosp-master/aosp_crosshatch-userdebug build, this takes the build
from 49s to 33s (no significant difference in peak memory)

Bug: 158488548
Test: build-aosp_crosshatch.ninja is the same before/after
Change-Id: I41fb7611030dd3ba824f896a9c9eadbdd218f464
Merged-In: I41fb7611030dd3ba824f896a9c9eadbdd218f464
(cherry picked from commit fd1e67b8ce)
2020-06-10 17:18:13 -07:00
Dan Willemsen
e88ef9299a Rewrite test data logic to make it faster
It turns out we have a few tests with thousands of test data files,
which this logic does not handle very well. Just switching from `x :=
$(x) ...` to `x += ...` accomplishes the majority of these gains, but I
rewrote the logic to be less function-call+eval based to hopefully make
it easier to understand.

For an aosp-master/aosp_coral-eng build, this brings the time spent in
this logic from 7.6s to 0.3s (total kati runtime of 54s to 46s). Kati's
peak memory use (maxrss) also shrunk from 6.1GB to 3.8GB.

Bug: 158488548
Test: build-aosp_coral.ninja is the same before/after
Change-Id: Ia2ec8b29b5c1dd12fa7ea10b4f80fe802c692725
Merged-In: Ia2ec8b29b5c1dd12fa7ea10b4f80fe802c692725
(cherry picked from commit c5ec8e95bc)
2020-06-10 17:18:05 -07:00
Paul Scovanner
fff4e1f5a4 Update Security String to 2020-08-05 am: d4b7f4de4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: I79b57da2c0387b33868dd36d3881d1d9ee3801b7
2020-06-10 21:01:31 +00:00
Paul Scovanner
d4b7f4de4b Update Security String to 2020-08-05
Bug: 158587413
Change-Id: I5f0b271fb5302e8c72024b49fb1a2ae5120821e0
2020-06-10 18:35:18 +00:00
Paul Scovanner
a26a678246 Update Security String to 2020-08-01 am: a4d5641a34
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11812416

Change-Id: Ic81f52a8bea6a2cba37f62ae00f42a8a130cf1b4
2020-06-10 16:56:15 +00:00
Paul Scovanner
a4d5641a34 Update Security String to 2020-08-01
Bug: 158587413
Change-Id: I21b16ed52ef9c7c26a671692c66b06855b147b16
2020-06-09 19:41:58 +00:00
yawanng
74800141bf iorap: Move the pinner property to product/build.prop
/system/build.prop must not be device-specific, it's for all Android targets.
The pinner.pin_camera=true is device-specific, so move it to /product/build.prop.

Bug: 158366075
Test: Make
Change-Id: Ie5cd37e09fe1d589ea619e6bb5edf807211d047f
2020-06-09 16:43:01 +00:00
TreeHugger Robot
7a726856a9 Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev 2020-06-09 11:14:45 +00:00
Josh Gao
76e974567c Rename adbd_system_binaries to adbd_system_api.
This is going to include libraries as well, so rename to reflect this.

Bug: http://b/157709367
Test: treehugger
Change-Id: I94625a6343e18032d8607cf8c58bde49d64db85c
(cherry picked from commit 67e0295833)
2020-06-08 14:07:02 -07:00
Dario Freni
b586dba65a Use APK CtsShim prebuilts for flattened apex.
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
2020-06-08 18:44:52 +00:00