Commit Graph

58946 Commits

Author SHA1 Message Date
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
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
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
J. Avila
b8d67f3722 Merge "Add LZ4 support to the release tools" 2020-06-11 14:56:38 +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
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
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
Elliott Hughes
534b035e29 Merge "Remove TARGET_PREFER_32_BIT." am: 9df45f6ec2
Original change: https://android-review.googlesource.com/c/platform/build/+/1288989

Change-Id: I4013f3521f2a6ee554412bdea45005d204c62a72
2020-06-10 18:25:42 +00:00
Elliott Hughes
9df45f6ec2 Merge "Remove TARGET_PREFER_32_BIT." 2020-06-10 18:07:06 +00:00
Treehugger Robot
ffbee4fbf3 Merge "base_rules.mk optimizations" am: 8add8cb145
Original change: https://android-review.googlesource.com/c/platform/build/+/1326240

Change-Id: Ia6260f3c2d9c536c33adbad9d48a37295f45235d
2020-06-10 02:48:48 +00:00
Treehugger Robot
8add8cb145 Merge "base_rules.mk optimizations" 2020-06-10 02:46:12 +00:00
Yo Chiang
6875feaf06 Merge "Cleanup unused get-32-bit-modules" am: 988693fb00
Original change: https://android-review.googlesource.com/c/platform/build/+/1307156

Change-Id: Idbd15eff972a94ec61fafb2603fee94b27cf9583
2020-06-10 02:41:14 +00:00
Yo Chiang
988693fb00 Merge "Cleanup unused get-32-bit-modules" 2020-06-10 02:30:24 +00:00
Dan Willemsen
8447b8116a 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
2020-06-09 09:59:24 -07:00
Treehugger Robot
27d4463cf5 Merge "More performance improvements" am: 1d1bb3b94f
Original change: https://android-review.googlesource.com/c/platform/build/+/1326018

Change-Id: Ic7187f5a94fab73d6689326b3517c83db1a16487
2020-06-09 04:47:27 +00:00
Treehugger Robot
1d1bb3b94f Merge "More performance improvements" 2020-06-09 04:36:32 +00:00
Yo Chiang
1e55e74acc Cleanup unused get-32-bit-modules
These are no longer used by anyone:
* get-32-bit-modules
* get-32-bit-modules-if-we-can
* get-host-32-bit-modules
* get-host-32-bit-modules-if-we-can

Bug: 155869107
Test: TH
Change-Id: I441de7f94061efd40186b80d1a2ead11669a5753
2020-06-09 03:28:26 +00:00
Dan Willemsen
fd1e67b8ce 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
2020-06-08 19:10:23 -07:00
Treehugger Robot
84849aef8e Merge "Rewrite test data logic to make it faster" am: 83e9cfe291
Original change: https://android-review.googlesource.com/c/platform/build/+/1326014

Change-Id: I1ef75ceda67b8735217fe69af81e6b9d1481894e
2020-06-09 01:15:26 +00:00
Treehugger Robot
83e9cfe291 Merge "Rewrite test data logic to make it faster" 2020-06-09 01:00:52 +00:00
Elliott Hughes
9b824d5ceb Remove TARGET_PREFER_32_BIT.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: I2ff7793c8b1eb56f6be63375cc7b70aa44254443
2020-06-08 16:36:52 -07:00
Frank Feng
833cd90432 Merge "Add test config template for sh_test." am: e4d2ccee92
Original change: https://android-review.googlesource.com/c/platform/build/+/1323217

Change-Id: Ic324a02e64c6197761b446d234eee383804856af
2020-06-08 21:17:04 +00:00
Josh Gao
821ecd2b56 Merge "Rename adbd_system_binaries to adbd_system_api." am: 581e1f4f1f
Original change: https://android-review.googlesource.com/c/platform/build/+/1322454

Change-Id: I415516a3575923a1b920b997d25541ccfb97ed0d
2020-06-08 21:16:39 +00:00
Frank Feng
e4d2ccee92 Merge "Add test config template for sh_test." 2020-06-08 21:05:31 +00:00
Josh Gao
581e1f4f1f Merge "Rename adbd_system_binaries to adbd_system_api." 2020-06-08 21:00:19 +00:00
Dan Willemsen
c5ec8e95bc 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
2020-06-08 11:42:51 -07:00
Treehugger Robot
21805afbc6 Merge changes I53c05800,Ic218283b am: 470cfbe8d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1317599

Change-Id: I1faab74b423476911d49560560789863c1ffe105
2020-06-08 16:06:22 +00:00
Jiyong Park
82d6dd6061 Merge changes I4d88733c,I61943476,Ibed9c96d am: c844de4241
Original change: https://android-review.googlesource.com/c/platform/build/+/1317597

Change-Id: I7057509d5bd3006a8dad1abb651ca473c06b5a57
2020-06-08 16:04:57 +00:00
Jiyong Park
9f2e9e1a7f Partial cherry-pick of ag/10260813 am: 9ebefc640d
Original change: https://android-review.googlesource.com/c/platform/build/+/1317600

Change-Id: I4f8bfd258c2888818f4c5eea4c03b863c5bfb719
2020-06-08 16:04:55 +00:00
Jiyong Park
236859d234 <partition>/build.prop rules are defined using macro am: e28fa80e12
Original change: https://android-review.googlesource.com/c/platform/build/+/1317596

Change-Id: I6e5bd7a93c6e7fe0e45ca5befb2f110bfb40c4e1
2020-06-08 16:04:52 +00:00
Treehugger Robot
3957e09d24 Merge "fix spurious / on toplevel kernel module installations" am: 208689cca8
Original change: https://android-review.googlesource.com/c/platform/build/+/1324842

Change-Id: I11ced68b692bbf74873a5cbd21ba46b007b0c48d
2020-06-08 16:04:20 +00:00
Xin Li
90325f7f73 [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 6e30a3fc86 -s ours
am skip reason: Change-Id I216989b052070e9f84bf1fa0f9ecc4724db50418 with SHA-1 0208ce535d is in history

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

Change-Id: Iad84b3031aa25e59044a8ae15a10420be731d853
2020-06-08 15:56:41 +00:00
Treehugger Robot
470cfbe8d7 Merge changes I53c05800,Ic218283b
* changes:
  Leave a comment when removing a prop
  Rule for system/build.prop is also from macro
2020-06-08 01:42:20 +00:00
Jiyong Park
cc49c6b8cd Leave a comment when removing a prop
post_process_prop.py doesn't simply drop a line when deleting a prop.
Instead, it makes the line as comment and leave a comment to clearly
mark that the prop was force removed. This is to aid the debugging.

Bug: 117892318
Test: m

Change-Id: I53c05800ff71d431a56dc370bcfe8bfc95c03bfc
2020-06-08 10:09:12 +09:00
Jiyong Park
bb26c6f2bf Rule for system/build.prop is also from macro
Like other <partition>/build.prop files, the build rule for
system/build.prop is also created using the build-properties macro.

system/build.prop has a few number of auto-generate properties that the
macro doesn't create. Those properties are emitted to intermediate files
using manually crafted rules, the paths to the files are fed to the
macro, where their contents are copied to system/build.prop.

This change also refactors the code fragment that defines BUILD_*
variables that identifes the given build.

Bug: 117892318
Test: m

Change-Id: Ic218283b40fedeaddacb3fda93167edbec86094c
2020-06-08 10:09:12 +09:00
Jiyong Park
c844de4241 Merge changes I4d88733c,I61943476,Ibed9c96d
* changes:
  remove buildinfo_common.sh
  Partial cherry-pick of ag/10260813
  <partition>/build.prop rules are defined using macro
2020-06-08 00:58:48 +00:00
Treehugger Robot
208689cca8 Merge "fix spurious / on toplevel kernel module installations" 2020-06-06 01:53:24 +00:00
Xin Li
6e30a3fc86 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:29 +00:00
Steve Muckle
950d723b9d fix spurious / on toplevel kernel module installations
When kernel modules are being put directly into lib/modules/ (as opposed
to lib/modules/<subdir>/), the empty part of the destination path causes
a target containing a redundant /. If the target is also added elsewhere
in the build without the redundant /, then rule merging will miss it,
and a build error will occur.

Bug: 158158635
Change-Id: I797addce760f4886166efa283302a53783581625
2020-06-05 12:10:56 -07:00
Ulyana Trafimovich
6a7f7b2662 Merge "Refactor library path representation in dexpreopt." am: 660edfdc4a
Original change: https://android-review.googlesource.com/c/platform/build/+/1321926

Change-Id: Iba2da276e7c88b6ed95db93825c233bebb2458c4
2020-06-05 10:53:49 +00:00
Ulyana Trafimovich
660edfdc4a Merge "Refactor library path representation in dexpreopt." 2020-06-05 10:46:01 +00:00
Treehugger Robot
b3e683614b Merge "Do not print environment variables if ANDROID_QUIET_BUILD is set." am: a48079902e
Original change: https://android-review.googlesource.com/c/platform/build/+/1324452

Change-Id: I810840cf5a94967bd733e500f47d5f6b0d9f7d3e
2020-06-05 07:01:05 +00:00