Commit Graph

63294 Commits

Author SHA1 Message Date
TreeHugger Robot
be105faf88 [automerger skipped] Merge "Add LZ4 support to the release tools" into rvc-dev am: 1455b76f9f am: 066fb272e3 -s ours
am skip reason: Change-Id I39680b91930d2d3cbd0cd565beb78e1ee699397e with SHA-1 98cd4cc7a3 is in history

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

Change-Id: I8c4e69209aea2af89cdc0dda2db8c7c839f3fe2c
2020-06-11 19:11:37 +00:00
TreeHugger Robot
066fb272e3 Merge "Add LZ4 support to the release tools" into rvc-dev am: 1455b76f9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11822828

Change-Id: I06f88d9f12222ecda26b03d3c2da023919de7ae5
2020-06-11 19:00:04 +00:00
Automerger Merge Worker
6a3041d8d7 Merge "Merge "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set." am: 537aee38d5 am: 110b79a2e3" into rvc-dev-plus-aosp 2020-06-11 18:59:51 +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
6c279f8600 [automerger skipped] Merge "Add LZ4 support to the release tools" into rvc-dev am: 1455b76f9f -s ours
am skip reason: Change-Id I39680b91930d2d3cbd0cd565beb78e1ee699397e with SHA-1 98cd4cc7a3 is in history

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

Change-Id: I0edeae9cb2830b2e0c425711e1cfb86efb2e514f
2020-06-11 18:59:42 +00:00
Colin Cross
0cb47d0534 Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" am: bc1051d399
Original change: https://android-review.googlesource.com/c/platform/build/+/1325119

Change-Id: Ibf45fb09ef5c66fde8981509a9b70ab9adacdf46
2020-06-11 18:41:58 +00:00
Colin Cross
f2458a5da7 Merge "Move definition of dist-for-goals before call." am: 80ef0a212c
Original change: https://android-review.googlesource.com/c/platform/build/+/1128914

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

Change-Id: I2333313c3cef5eb0b760c2e60fcb927e1bcb1eed
2020-06-11 18:41:32 +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
318df583f3 Merge "Add LZ4 support to the release tools" am: b8d67f3722 am: d2cbd57b33 am: 7d9f715f29 am: 59f32d0d4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1329115

Change-Id: Ia6a60270d0b58b89dda3c4e7bdf960831de8b046
2020-06-11 15:57:01 +00:00
J. Avila
59f32d0d4e Merge "Add LZ4 support to the release tools" am: b8d67f3722 am: d2cbd57b33 am: 7d9f715f29
Original change: https://android-review.googlesource.com/c/platform/build/+/1329115

Change-Id: Ic75c37f6031859326521b2ca3f4db97bd443145b
2020-06-11 15:42:17 +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
d2cbd57b33 Merge "Add LZ4 support to the release tools" am: b8d67f3722
Original change: https://android-review.googlesource.com/c/platform/build/+/1329115

Change-Id: I3ba539a0595371aa198decdaf14525b8b62a9a85
2020-06-11 15:06:44 +00:00
Ulyana Trafimovich
c1ecd55a06 Merge "Fix on-device paths to used libraries in dexpreopt." am: cd33e76411 am: c048d40cc9 am: 5ed9d68b9e am: f3fd59367c
Original change: https://android-review.googlesource.com/c/platform/build/+/1325806

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

Change-Id: Id8c105a62f1c539bd38e82430eee121e83ad4034
2020-06-11 14:42:11 +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
c048d40cc9 Merge "Fix on-device paths to used libraries in dexpreopt." am: cd33e76411
Original change: https://android-review.googlesource.com/c/platform/build/+/1325806

Change-Id: I8f420aa79eb93b53e1e97e6b89c49b341cdbad13
2020-06-11 13:57:52 +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
d40b10fdba Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df75f am: 9d7c4c0a69 am: 1a55074cec am: b7707161de
Original change: https://android-review.googlesource.com/c/platform/build/+/1324517

Change-Id: I712bfc62acaaf100fd3893d994e97404d1afd42c
2020-06-11 11:18:30 +00:00
Martin Stjernholm
12c9505eee Introduce TARGET_BUILD_UNBUNDLED. am: 7a430fd4c8 am: 6c1aae726f am: b3fc54e824 am: 823285a5ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1324512

Change-Id: I91da0232938461dcf38dc118b9ca15d4be6809bf
2020-06-11 11:18:27 +00:00
Martin Stjernholm
b7707161de Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df75f am: 9d7c4c0a69 am: 1a55074cec
Original change: https://android-review.googlesource.com/c/platform/build/+/1324517

Change-Id: If3cc8f835bc0eca2e740ae0b6682b030134d3d65
2020-06-11 11:04:20 +00:00
Martin Stjernholm
823285a5ef Introduce TARGET_BUILD_UNBUNDLED. am: 7a430fd4c8 am: 6c1aae726f am: b3fc54e824
Original change: https://android-review.googlesource.com/c/platform/build/+/1324512

Change-Id: I11fcea19992baecd99c92414e1cd5dcc455fe723
2020-06-11 11:04: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
Martin Stjernholm
9d7c4c0a69 Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: 77112df75f
Original change: https://android-review.googlesource.com/c/platform/build/+/1324517

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

Change-Id: I2a3e2b2487f35f4e9cb0458cbaa433abed042daa
2020-06-11 10:26:08 +00:00
Martin Stjernholm
77112df75f Merge changes from topics "target-build-unbundled", "unbundled-preopt"
* changes:
  Disable dexpreopting when TARGET_BUILD_APPS is used.
  Introduce TARGET_BUILD_UNBUNDLED.
2020-06-11 10:01:59 +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
a06f8ba855 Organize product vars for adding properties am: 1ea01c5b24 am: 5c418f56d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11807458

Change-Id: I33ed8ee57961dea0b0c3e599788f4b7f946de3e8
2020-06-11 08:24:48 +00:00
Jiyong Park
5c418f56d0 Organize product vars for adding properties am: 1ea01c5b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11807458

Change-Id: I2ef1f2c7471b872569497b6daf4e2aa0d907ca6c
2020-06-11 08:10:58 +00: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
Automerger Merge Worker
e76a168a57 Merge "Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: 5ac3b0f216 am: f63176e23e" into rvc-qpr-dev-plus-aosp 2020-06-10 21:43:45 +00:00
Paul Scovanner
28945e3826 Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: 5ac3b0f216 am: f63176e23e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: Id58604f76c456726a028c70840efba38a1add690
2020-06-10 21:43:41 +00:00
Automerger Merge Worker
0393621c81 Merge "Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: f29dd68f61" into rvc-d1-dev-plus-aosp am: cad7620403
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: Id4faa871b220f7fe629c4d4f15efc5e627b5a8db
2020-06-10 21:43:36 +00:00
Paul Scovanner
10bcb51a1c Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: 5ac3b0f216 am: 58ff2583db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: Ia5d104a3676ebcfb5ae116d5b32ed8a8319ff351
2020-06-10 21:43:27 +00:00
Automerger Merge Worker
cad7620403 Merge "Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: f29dd68f61" into rvc-d1-dev-plus-aosp 2020-06-10 21:26:18 +00:00
Paul Scovanner
cd4be4c7c4 Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: f29dd68f61
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: I1634657d17819ba5942a6ecc665d1f6988a5b11b
2020-06-10 21:26:13 +00:00
Paul Scovanner
58ff2583db Update Security String to 2020-08-05 am: d4b7f4de4b am: fff4e1f5a4 am: 5ac3b0f216
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11826025

Change-Id: I752a7a8d4c6c434d1078aba67bd7b5f50b76d84b
2020-06-10 21:26:05 +00:00