tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
63638 commits 1 branch 0 tags 119 MiB
Commit graph

24295 commits

Author SHA1 Message Date
Treehugger Robot
0dabbf560c Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271 am: e2e3df64b0 am: bc09fa8b55 am: 6f52047eeb am: 9630e3b0ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241

Change-Id: If93c3b297890e3dc816df41d3eb2841ab2f13cb3
 2020-06-17 02:52:48 +00:00
Treehugger Robot
bc09fa8b55 Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271 am: e2e3df64b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241

Change-Id: I5df51f8ed927f618c3b0d5f9eb70a592a91ab23b
 2020-06-17 01:57:44 +00:00
Dan Willemsen
343caec30c Refactor how MODULES-IN-* is defined 
Unlike the previous performance patches, this does change the ninja
file, shrinking build-aosp_crosshatch.ninja on aosp-master from 393MB to
387MB, while reducing kati runtime from 28.6s to 27.7s.

Previously, MODULES-IN-art would depend on every target defined under
art/***. After this change, it only depends on the modules names that
were directly defined under it, and depends on the MODULES-IN-art-*
for its subfolders.

Bug: 158488548
Test: mmma system/core/adb
Test: mmma system/core
Change-Id: Idfe80f707738faae4777e0d6dc9fd08014775696
 2020-06-16 15:35:37 -07:00
Ryan Prichard
221ec1d153 Merge "Unlist libunwind as a critical component" 2020-06-16 21:49:02 +00:00
Treehugger Robot
54932988cd Merge "Include image descriptor of only the first boot image in vbmeta" am: 397972fa6a am: 765d9a7e00 am: 623bea86e1 am: 2f3c2b1c97 am: ad83b2c51d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1328118

Change-Id: Ie557e40a9c930f80fddecc36a290b5e477d29145
 2020-06-16 01:17:02 +00:00
Treehugger Robot
623bea86e1 Merge "Include image descriptor of only the first boot image in vbmeta" am: 397972fa6a am: 765d9a7e00 
Original change: https://android-review.googlesource.com/c/platform/build/+/1328118

Change-Id: I7338d991ac9d6a51e29b1c1f94dd6088bb0238a4
 2020-06-16 00:34:54 +00:00
Treehugger Robot
397972fa6a Merge "Include image descriptor of only the first boot image in vbmeta" 2020-06-16 00:05:28 +00:00
Roland Levillain
43563ec965 Merge "Introduce product variables to select Java code coverage paths in Make." am: b07814dffd am: 6675197a76 am: 1512b8caa6 am: 80a61cf12d am: 41d7646b36 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325808

Change-Id: Ib09021adbe7692870ae5d47777027d45e92ac0fc
 2020-06-15 19:57:30 +00:00
Roland Levillain
1512b8caa6 Merge "Introduce product variables to select Java code coverage paths in Make." am: b07814dffd am: 6675197a76 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325808

Change-Id: I0c41faf37fd4eed6e21651cc78809c94eb78676e
 2020-06-15 19:07:08 +00:00
Roland Levillain
cbc1cd92fc Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 am: 85781a7619 am: 923eed8a30 am: 8f8ee262b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: Idbbb98bead0c4c14963f15a55e6f80ef954e7f93
 2020-06-15 11:15:23 +00:00
Roland Levillain
17541b9512 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
Change-Id: I5de6eb460709d7d66d81e3432e11f94ff14dd1c9
 2020-06-15 11:51:56 +01:00
Roland Levillain
85781a7619 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: I5d132e7781b92814f3e003d73719bf7da4f175c6
 2020-06-15 10:37:09 +00:00
Roland Levillain
d160a49df3 Merge "Rename native code coverage paths product variables in Make." 2020-06-15 10:12:10 +00:00
Jiyong Park
cd0c931b89 Merge "Organize product vars for adding properties" 2020-06-15 10:00:22 +00:00
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
Treehugger Robot
8b015bd0ad Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb am: 31508fb715 am: e37255eefa am: 81201723c9 am: 36e96e6f9a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: I676a7619e5f02f0e413564d971ab3b96242ed7f9
 2020-06-13 03:34:17 +00:00
Colin Cross
9d8f932969 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp am: 8fae3c8472 am: d3080ae30c am: ff3173188b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11856223

Change-Id: I9bece0f6b5e992dbac012f25bfa41c1cffa5bef6
 2020-06-13 03:33:33 +00: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
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
madym
aeb927fbfc Merge "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set."" am: cca4dffa6f am: 35e9165b0c am: ae1e6d2275 am: 5822163a81 am: 277760a216 
Original change: https://android-review.googlesource.com/c/platform/build/+/1331942

Change-Id: I2d7d79a10fa99453038f11ce4a211f21a50d98f4
 2020-06-12 00:21:29 +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
8545634a3b Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" am: bc1051d399 am: 0cb47d0534 am: f2d4c5784b am: 4f7818db9e am: 1819aadff1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1325119

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

Change-Id: I4ca7eccb540655d434ef55a77de3416b1b991e6e
 2020-06-11 21:38:00 +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
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
Automerger Merge Worker
24ac4e5dc2 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 am: 6a3041d8d7 am: 64d3ce9bf0 am: 76c8cc7e0d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1321934

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

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

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

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

Change-Id: Id0626a1f0be4d45db79ce28fbdf2819331bdb125
 2020-06-11 11:47:37 +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
TreeHugger Robot
79d5bb51b3 Merge "Organize product vars for adding properties" 2020-06-11 06:12:29 +00:00