Commit Graph

24204 Commits

Author SHA1 Message Date
Roland Levillain
bad8b386e6 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
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23
2020-06-14 19:14:56 +01: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
Treehugger Robot
e37255eefa Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb am: 31508fb715
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: Id8f1151f329fea0d7aa8e3c25de8af3dbba1f8e9
2020-06-13 02:51:33 +00:00
Colin Cross
8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I12bbaf25876357f564829044b672f042240b2acf
2020-06-12 17:46:50 -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
Treehugger Robot
9d54fbebcb Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" 2020-06-12 04:22:25 +00:00
Treehugger Robot
2158d2ec6b Merge "Use inclusive language in build/make" 2020-06-12 03:19:02 +00:00
Dan Willemsen
d120ac68fa 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

Change-Id: I8f8c006432f3b8120df1f39c98009155fdff32ad
Test: treehugger
2020-06-12 02:39:38 +00: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
madym
ae1e6d2275 Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" am: cca4dffa6f am: 35e9165b0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1331942

Change-Id: Ibbb280710c5de22e225273bca8bda1eb53117fd7
2020-06-11 22:50:39 +00:00
madym
cca4dffa6f Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" 2020-06-11 22:25:05 +00:00
madym
dd9467aa23 Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."
This reverts commit a81ee59b74.

Reason for revert: maybe broke the build b/158783867

Change-Id: Ia7a81109de3adb4b5226b4139f3e231e60473283
2020-06-11 22:05:42 +00:00
Colin Cross
c3ad80467e Use inclusive language in build/make
Test: m checkbuild
Change-Id: I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28
2020-06-11 14:37:54 -07: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
Colin Cross
f2d4c5784b Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" am: bc1051d399 am: 0cb47d0534
Original change: https://android-review.googlesource.com/c/platform/build/+/1325119

Change-Id: I403c456cc8e24f5795513f31aecf6a96927c93eb
2020-06-11 20:47:03 +00:00
Colin Cross
6de1a4a273 Merge "Move definition of dist-for-goals before call." am: 80ef0a212c am: f2458a5da7
Original change: https://android-review.googlesource.com/c/platform/build/+/1128914

Change-Id: Ia3736984d5679d017b254a09f86130ffe6df7a68
2020-06-11 20:47:00 +00:00
Sophie Zheng
7162ca2ff4 Merge "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set." am: 537aee38d5 am: 110b79a2e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1321934

Change-Id: I40447b16666ed216478087a5c50bacf8b25ccd7a
2020-06-11 18:59:46 +00:00
TreeHugger Robot
1455b76f9f Merge "Add LZ4 support to the release tools" into rvc-dev 2020-06-11 18:41:19 +00:00
Colin Cross
bc1051d399 Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" 2020-06-11 18:36:18 +00:00
Colin Cross
80ef0a212c Merge "Move definition of dist-for-goals before call." 2020-06-11 18:36:18 +00:00
Sophie Zheng
537aee38d5 Merge "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set." 2020-06-11 18:21:53 +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
J. Avila
7d9f715f29 Merge "Add LZ4 support to the release tools" am: b8d67f3722 am: d2cbd57b33
Original change: https://android-review.googlesource.com/c/platform/build/+/1329115

Change-Id: I91a65d982169c81409532561f6dae3ddb17b7398
2020-06-11 15:20:29 +00:00
J. Avila
b8d67f3722 Merge "Add LZ4 support to the release tools" 2020-06-11 14:56:38 +00:00
Ulyana Trafimovich
5ed9d68b9e Merge "Fix on-device paths to used libraries in dexpreopt." am: cd33e76411 am: c048d40cc9
Original change: https://android-review.googlesource.com/c/platform/build/+/1325806

Change-Id: Ic563dbd7ae789d6a7ad83a4c4dce02053aff3c83
2020-06-11 14:23:22 +00:00
Ulyana Trafimovich
cd33e76411 Merge "Fix on-device paths to used libraries in dexpreopt." 2020-06-11 13:47:19 +00:00
Martin Stjernholm
1a55074cec Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df75f am: 9d7c4c0a69
Original change: https://android-review.googlesource.com/c/platform/build/+/1324517

Change-Id: Ie920749470b3ac13ce8aab37474b02fe816af52a
2020-06-11 10:43:16 +00:00
Martin Stjernholm
b3fc54e824 Introduce TARGET_BUILD_UNBUNDLED. am: 7a430fd4c8 am: 6c1aae726f
Original change: https://android-review.googlesource.com/c/platform/build/+/1324512

Change-Id: I8777dd8241790686f32dd03319f88c0c7815da71
2020-06-11 10:43:13 +00:00
Ulya Trafimovich
2311f61b12 Fix on-device paths to used libraries in dexpreopt.
Also, add function `install-path-to-on-device-path` that converts
its one argument from on-host install path to on-device path by
stripping PRODUCT_OUT prefix.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: Cherry-pick in internal master and check that on-device path to
    com.google.android.dialer.support.jar now is on /product partition
    (as it should be) and not on /system:
    $ oatdump \
        --instruction-set=x86 \
        --oat-file=out/target/product/vsoc_x86/product/priv-app/GoogleDialer/oat/x86/GoogleDialer.odex \
      | grep '^classpath' \
      | grep -o '[^[]*com.google.android.dialer.support.jar'
    /product/framework/com.google.android.dialer.support.jar

Bug: 132357300
Change-Id: I9bbe45ffbbed09186ac46e067da7ada599ef9678
2020-06-11 10:10:00 +01:00
Jiyong Park
eb49b34b1e Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from internal master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:35:23 +09:00
Jiyong Park
1ea01c5b24 Organize product vars for adding properties
Properties for <partition>/build.prop are now added via
PRODUCT_<PARTITION>_PROPERTIES.

PRODUCT_SYSTEM_PROPERTIES is added. PRODUCT_SYSTEM_DEFAULT_PROPERTIES
will be deprecated.

PRODUCT_VENDOR_PROPERTIES is added. PRODUCT_PROPERTY_OVERRIDES and
PRODUCT_DEFAULT_PROPERTY_OVERRIDES will be deprecated in favor of the new
variable.

For other partitions (odm, system_ext, product), there is no change.

Exempt-From-Owner-Approval: cherry-pick from master

Bug: 117892318
Test: m
Merged-In: I98f3b5d0da661b3ad75260a23754e655103b7a44
(cherry picked from commit ad810b6dae)
Change-Id: I98f3b5d0da661b3ad75260a23754e655103b7a44
2020-06-11 15:13:41 +09: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
Martin Stjernholm
f712ba95dc Disable dexpreopting when TARGET_BUILD_APPS is used.
This moves the condition from Soong to make, so that
config.UnbundledBuild() in Soong no longer implies disabling
dexpreopting.

Test: TH, in particular builds green on ub-launcher3-master
Bug: 157549171
Change-Id: I7273be8591c9d627d89e033b641139dacc275806
2020-06-11 01:09:53 +01:00
Martin Stjernholm
7a430fd4c8 Introduce TARGET_BUILD_UNBUNDLED.
Setting this flag enables unbundled building, i.e. without support for
building the system image and other platform targets. This
functionality was previously enabled by TARGET_BUILD_APPS, and setting
that still implies TARGET_BUILD_UNBUNDLED.

This helps unbundled builds that aren't apps, e.g. ART runtest builds.
Specifically, with the topic of the child CL
https://r.android.com/1324517 TARGET_BUILD_UNBUNDLED does not imply
disabling dexpreopting, unlike TARGET_BUILD_APPS.

TODO: There may still be app-specific conditions that are incorrectly
controlled by TARGET_BUILD_UNBUNDLED, in particular on the Soong side
through config.UnbundledBuild().

Test: Flash & boot
Test: TH, in particular builds green on ub-launcher3-master
Bug: 157549171
Change-Id: Ic09fc879117ee06cab5444edfc280ed2b52d2870
2020-06-11 01:09:07 +01:00
J. Avila
98cd4cc7a3 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
Change-Id: I39680b91930d2d3cbd0cd565beb78e1ee699397e
2020-06-10 21:51:19 +00:00
Paul Scovanner
f29dd68f61 Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: Idf56ba322e87a6c2e06205d60b4e5bfa5d866ee7
2020-06-10 21:07:31 +00: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
Elliott Hughes
71e9c32390 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2 am: 534b035e29
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: Ib72e06fd5b674606403bee352d3ddbd93d7430c7
2020-06-10 18:36:54 +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
Elliott Hughes
9df45f6ec2 Merge "Remove TARGET_PREFER_32_BIT." 2020-06-10 18:07:06 +00:00
Paul Scovanner
949a33b139 Update Security String to 2020-08-01 am: a4d5641a34 am: a26a678246
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11812416

Change-Id: I4c13a2a555ff3ec3c16fd44f4e6667765738fc15
2020-06-10 17:07:34 +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
Roopesh Nataraja
3e15f6edb1 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
2020-06-10 07:44:12 -07:00
Treehugger Robot
4c7dc6e511 Merge "base_rules.mk optimizations" am: 8add8cb145 am: ffbee4fbf3
Original change: https://android-review.googlesource.com/c/platform/build/+/1326240

Change-Id: Idd897d57865e3834d3fcd8fb7788b7a2a75e3e1e
2020-06-10 02:53:43 +00:00
Yo Chiang
d84cd89894 Merge "Cleanup unused get-32-bit-modules" am: 988693fb00 am: 6875feaf06
Original change: https://android-review.googlesource.com/c/platform/build/+/1307156

Change-Id: I898fb6454fef8fddac8b467c9ccc14a2dfb25611
2020-06-10 02:53:34 +00:00
Treehugger Robot
8add8cb145 Merge "base_rules.mk optimizations" 2020-06-10 02:46:12 +00:00
Yo Chiang
988693fb00 Merge "Cleanup unused get-32-bit-modules" 2020-06-10 02:30:24 +00:00