Commit Graph

63294 Commits

Author SHA1 Message Date
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
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
Roland Levillain
bececf9e92 Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS.
The use of environment variables `COVERAGE_PATHS` and
`COVERAGE_EXCLUDE_PATHS` has been deprecated since they have been
replaced by `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Change-Id: I1c48dc4da15c630201168cce34edb920960c93d4
2020-06-16 11:27:34 +01:00
Anton Hansson
c5fa7396ba Mark jni libs as REQUIRED by their app
This makes the dependencies of the jni lib .so appear in
product_target_FILES. Previously, only the jni lib .so
itself appeared, as an effect of being added to the
INSTALLED files of the app.

Bug: 129323707
Test: compare the output between `m dump-files` and installed-files.txt
Test: noop in terms of build artifacts
Change-Id: Ie391bb45ad7758e51368cabb1ecba5caeae2f09c
2020-06-16 16:13:03 +08:00
Colin Cross
e911d27efb [automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 am: f24ee30bc8 -s ours am: b7ef01ba27 -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 a1383d8f9d is in history

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

Change-Id: If93d8dc996856c5742770d150ea38680f955f0a8
2020-06-16 04:18:44 +00:00
Automerger Merge Worker
71931f5cf8 Merge "[automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 -s ours am: df912553c7 -s ours" into rvc-d1-dev-plus-aosp am: b93a034665 -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 a1383d8f9d is in history

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

Change-Id: Idc24ed6c0d40f9debc56032e7d7844cc768ba2b2
2020-06-16 04:18:23 +00:00
Automerger Merge Worker
9d3ae726cc Merge "[automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927 -s ours" into rvc-d1-dev-plus-aosp am: decf1ed769 -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 3cd4a076ba is in history

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

Change-Id: If9fd44ac9c8fdd73755f5192f2574e297828d96d
2020-06-16 04:17:43 +00:00
Colin Cross
6465a0a877 [automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 am: f24ee30bc8 am: be74a37f2c -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 c3ad80467e is in history

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

Change-Id: I2361dfd9cc4442b53693d9709c66eec1a907d967
2020-06-16 04:17:33 +00:00
Colin Cross
46b8b23e9e [automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927 am: 0ec6a1e77c -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 3cd4a076ba is in history

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

Change-Id: I6537e42d4c5ace0dc2a12419e9b088c6c4de81c7
2020-06-16 04:17:04 +00:00
Colin Cross
9de244e6b2 [automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b -s ours am: 75cb04a91c -s ours am: 20b91b2911 -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 8ca4092ab4 is in history

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

Change-Id: If5f850144c2f04bb80c8386ffe9d545cc14cbb30
2020-06-16 04:16:46 +00:00
Colin Cross
be74a37f2c Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 am: f24ee30bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857304

Change-Id: I4737e85175bfb1de89c35272c27ab3ff3d446751
2020-06-16 03:59:25 +00:00
Colin Cross
b7ef01ba27 [automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 am: f24ee30bc8 -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 a1383d8f9d is in history

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

Change-Id: I69320f76a4469033410d6359df12a7ccc343bd71
2020-06-16 03:58:48 +00:00
Colin Cross
0ec6a1e77c Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857303

Change-Id: Ibb6a90f0d770954e543623e161acc4b06ff447db
2020-06-16 03:58:44 +00:00
Automerger Merge Worker
b93a034665 Merge "[automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 -s ours am: df912553c7 -s ours" into rvc-d1-dev-plus-aosp 2020-06-16 03:58:41 +00:00
Automerger Merge Worker
decf1ed769 Merge "[automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927 -s ours" into rvc-d1-dev-plus-aosp 2020-06-16 03:58:38 +00:00
Colin Cross
244f843a5c [automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 -s ours am: df912553c7 -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 c3ad80467e is in history

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

Change-Id: I7b563e53d51d17cda37e560bd697897ae403c6f7
2020-06-16 03:58:34 +00:00
Colin Cross
adca746eda [automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b am: bf3825b927 -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 8ca4092ab4 is in history

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

Change-Id: Ib1d0578c51acac44c3834e6dbb8cc52ad9d6a1c0
2020-06-16 03:58:20 +00:00
Colin Cross
20b91b2911 [automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b -s ours am: 75cb04a91c -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 8ca4092ab4 is in history

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

Change-Id: I3c7a8b4b7691fbd959f70491524709c845d00263
2020-06-16 03:58:18 +00:00
Colin Cross
f24ee30bc8 Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857304

Change-Id: I574f32f6061129b2c8b3c52f34f54a0600682331
2020-06-16 03:44:54 +00:00
Colin Cross
bf3825b927 Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11857303

Change-Id: I48d751fe940c208dd151d032927050a258bf47ef
2020-06-16 03:43:26 +00:00
Colin Cross
df912553c7 [automerger skipped] Merge "Use inclusive language in build/make" into rvc-dev am: 7244e60105 -s ours
am skip reason: Change-Id I54a7e55d3fdd5571ef1ae33ebe443c10d138fd28 with SHA-1 c3ad80467e is in history

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

Change-Id: Id849de50f5e5e367e1ed0fc40b785cb1fcdf44dc
2020-06-16 03:43:12 +00:00
Colin Cross
75cb04a91c [automerger skipped] Merge "Add out/soong/late-${TARGET_PRODUCT}.mk" into rvc-dev am: 2be0200a8b -s ours
am skip reason: Change-Id I7754fd1b8dab508c96ad59beed67f0d6c4ff75f0 with SHA-1 8ca4092ab4 is in history

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

Change-Id: I5bc287684a64358b4f4c76e635f72e4b935b4565
2020-06-16 03:42:51 +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
Treehugger Robot
ad83b2c51d Merge "Include image descriptor of only the first boot image in vbmeta" am: 397972fa6a am: 765d9a7e00 am: 623bea86e1 am: 2f3c2b1c97
Original change: https://android-review.googlesource.com/c/platform/build/+/1328118

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

Change-Id: Ie5310bb782df66ba9fe982a529c70013d6da24bd
2020-06-16 00:45:48 +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
765d9a7e00 Merge "Include image descriptor of only the first boot image in vbmeta" am: 397972fa6a
Original change: https://android-review.googlesource.com/c/platform/build/+/1328118

Change-Id: I9766df5060f5bfc51eb3568fcd4d8b986e380d3d
2020-06-16 00:19:21 +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
397972fa6a Merge "Include image descriptor of only the first boot image in vbmeta" 2020-06-16 00:05:28 +00:00
Sophie Zheng
970d5925bd Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""
This reverts commit dd9467aa23.

Reason for revert: Fix to the breakage merged in https://android-review.googlesource.com/c/platform/build/soong/+/1332082.

Forest test build pass: http://shortn/_AWiWymhTjF

Change-Id: Ie47b84c51e85c8d372c5ee49963d671ff08ef91a
2020-06-15 20:42:37 +00:00
Roland Levillain
41d7646b36 Merge "Introduce product variables to select Java code coverage paths in Make." am: b07814dffd am: 6675197a76 am: 1512b8caa6 am: 80a61cf12d
Original change: https://android-review.googlesource.com/c/platform/build/+/1325808

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

Change-Id: I7be7d26cb1188bcc9e6fdd0b03cf0fec8c27dce0
2020-06-15 19:30:40 +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
6675197a76 Merge "Introduce product variables to select Java code coverage paths in Make." am: b07814dffd
Original change: https://android-review.googlesource.com/c/platform/build/+/1325808

Change-Id: Iaa97ba89334fcbea2297f2b6a2d706c7c14cc0df
2020-06-15 18:50:24 +00:00
Roland Levillain
b07814dffd Merge "Introduce product variables to select Java code coverage paths in Make." 2020-06-15 18:41:03 +00:00
TreeHugger Robot
0a102b2e03 [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb am: bfa51c085e -s ours am: 80d8eed97b -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 e56f07725b is in history

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

Change-Id: I2597951df09e142cb2068a4879498161ed851a40
2020-06-15 17:35:01 +00:00
TreeHugger Robot
dc79bdf818 [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb am: bfa51c085e am: 71c7831782 -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 e56f07725b is in history

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

Change-Id: I1b26c58aa6b07fbee246d07c5aae4b48321b8383
2020-06-15 17:34:35 +00:00
TreeHugger Robot
5f02136b71 [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb -s ours am: dced2e7e4f -s ours am: f75bd85ace -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 7e32b34ed3 is in history

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

Change-Id: I958af0e37fe91e8eb6bfae6721f79b6e0a285df8
2020-06-15 17:34:25 +00:00
TreeHugger Robot
71c7831782 Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb am: bfa51c085e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11835428

Change-Id: I056d23fac21b2f9761cbd3c6a49770411ab36bd5
2020-06-15 17:18:45 +00:00
TreeHugger Robot
80d8eed97b [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb am: bfa51c085e -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 e56f07725b is in history

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

Change-Id: If1d18993804e1374fc8f86db6a4ec8dc2782f520
2020-06-15 17:18:27 +00:00
TreeHugger Robot
f75bd85ace [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb -s ours am: dced2e7e4f -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 7e32b34ed3 is in history

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

Change-Id: I050cd899a79610bc6260a8236dc2f7feca6f5b28
2020-06-15 17:18:02 +00:00
TreeHugger Robot
bfa51c085e Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11835428

Change-Id: I99532f4b31364453b68850a32b24ca632781bf06
2020-06-15 16:58:52 +00:00
TreeHugger Robot
dced2e7e4f [automerger skipped] Merge "Add test config template for sh_test." into rvc-dev am: 2e2cb808cb -s ours
am skip reason: Change-Id Id8ce5dd0723e8c95921e2e20bff72fc828d47d87 with SHA-1 7e32b34ed3 is in history

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

Change-Id: I19df3a5041d0eb6e8c9a0f7e6f03e74b37e38bfb
2020-06-15 16:58:45 +00:00
TreeHugger Robot
2e2cb808cb Merge "Add test config template for sh_test." into rvc-dev 2020-06-15 16:37:06 +00:00
Roland Levillain
8f8ee262b4 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 am: 85781a7619 am: 923eed8a30
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: Ifb0952464184eff71af72a2dfaa1853e23928b5b
2020-06-15 11:04:00 +00:00
Jiyong Park
4684f0a2ce [automerger skipped] Merge "Organize product vars for adding properties" am: cd0c931b89 am: 2e906be272 -s ours am: bd8b0a4b08 -s ours am: b39da2d79c -s ours
am skip reason: Change-Id I98f3b5d0da661b3ad75260a23754e655103b7a44 with SHA-1 1ea01c5b24 is in history

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

Change-Id: Id93d69c9ce368da966e207188ed9114f8f6c76b2
2020-06-15 11:03:42 +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
923eed8a30 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3 am: b502030f63 am: 85781a7619
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: I088be59080a857bfe5de6dc933e109743346b8cb
2020-06-15 10:51:22 +00:00
Jiyong Park
b39da2d79c [automerger skipped] Merge "Organize product vars for adding properties" am: cd0c931b89 am: 2e906be272 -s ours am: bd8b0a4b08 -s ours
am skip reason: Change-Id I98f3b5d0da661b3ad75260a23754e655103b7a44 with SHA-1 1ea01c5b24 is in history

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

Change-Id: I40c7fa7383c23f419b22653e12564ff758382a89
2020-06-15 10:51:06 +00:00