Commit Graph

59066 Commits

Author SHA1 Message Date
J. Avila
dbbd970d18 Merge "Switch to using llvm-strip for modules" 2020-06-22 15:19:26 +00:00
Yo Chiang
697674fa56 Resolve module bitness for target-host required modules
Add select-bitness-of-target-host-required-modules that resolves module
bitness for TARGET_REQUIRED_FROM_HOST and HOST_REQUIRED_FROM_TARGET.
Also re-indent select-bitness-of-required-modules.

Bug: 7456955
Test: TH
Test: compare value of ALL_MODULES.<*>.*_REQUIRED_FROM_*
Change-Id: I9483685d8dd528cb1a4ef1e2ec53cbe2caa598a4
2020-06-22 07:07:10 +00:00
Chris Gross
d169a3fcad Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." am: e08e40947b
Original change: https://android-review.googlesource.com/c/platform/build/+/1321954

Change-Id: I3c7beb5c7ffacc3629536844e6543329dae1ddb0
2020-06-19 22:49:27 +00:00
Ryan Prichard
7146b7cd46 Unlist libunwind as a critical component
Virtually nothing uses libunwind, and no one should start using it, so
it's unlikely to be critical.

(Code should use libunwindstack.so to collect backtraces, and it should
use libc.so's _Unwind_* APIs for C++ exception handling unwinding.)

Test: build Android
Change-Id: I81882a4634ff4d397abe8a7cf5ff15a22a3eed2f
Merged-In: I81882a4634ff4d397abe8a7cf5ff15a22a3eed2f
(cherry picked from commit 9355aeba79)
2020-06-19 22:38:42 +00:00
Chris Gross
e08e40947b Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." 2020-06-19 22:32:37 +00:00
J. Avila
f7586025a2 Switch to using llvm-strip for modules
The gcc tools are deprecated; replace with the llvm equivalent.

Bug: 158484106
Change-Id: I9c3717bde281667eec82cc21dc63dc7fd5592a46
2020-06-19 21:32:45 +00:00
Treehugger Robot
cd9ebd46ab Merge "adjust vendor ramdisk file extension based on compression" am: 5dda5caeb9
Original change: https://android-review.googlesource.com/c/platform/build/+/1344080

Change-Id: I132bf43d7f9f1617864ee3e4d5488894e79fc0c4
2020-06-19 06:46:07 +00:00
Treehugger Robot
5dda5caeb9 Merge "adjust vendor ramdisk file extension based on compression" 2020-06-19 06:32:45 +00:00
Steve Muckle
414dbe15ab adjust vendor ramdisk file extension based on compression
The extension for the generated vendor ramdisk should be updated based
on the compression scheme used.

Bug: 158433703
Change-Id: I25fff0b8a7879f6aa6d6fe2fce9f5a53f90eb636
2020-06-18 21:38:35 -07:00
Paul Duffin
7e3a36b3ef Merge "Fail check-boot-jars if boot jar contains 0 .class files" am: e5fc8fdf5e
Original change: https://android-review.googlesource.com/c/platform/build/+/1341793

Change-Id: Iadc2872f8fd53d890dc8ba15344b53dbe071004e
2020-06-18 19:46:40 +00:00
Sophie Zheng
5a8764a6a7 Merge "NDK api code coverage" am: 34fe2651ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181

Change-Id: I5a3897414e6237e02c69cf1bf68014b338e2b5c4
2020-06-18 19:46:14 +00:00
Paul Duffin
e5fc8fdf5e Merge "Fail check-boot-jars if boot jar contains 0 .class files" 2020-06-18 19:35:22 +00:00
Sophie Zheng
34fe2651ed Merge "NDK api code coverage" 2020-06-18 19:26:00 +00:00
Treehugger Robot
31dff639b1 Merge "Remove use of metalava compatible output" am: efc6dfb703
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659

Change-Id: I5bc25f60f42a9358545992805a99737a07508afd
2020-06-18 18:10:30 +00:00
Treehugger Robot
efc6dfb703 Merge "Remove use of metalava compatible output" 2020-06-18 17:57:05 +00:00
Paul Duffin
70dd47f0df Fail check-boot-jars if boot jar contains 0 .class files
Protect against an invalid boot jar, e.g. one containing .dex files is
used instead of .class files.

Test: add a prebuilt for framework-tethering
      Run `m check-boot-jars` with the first fix from
	  https://r.android.com/1341756 and the build fails due to no
	  .class files because a dex jar is used.
	  Run `m check-boot-jars` with all fixeds from
	  https://r.android.com/1341756 and the build works.
Bug: 158304459
Bug: 159112414
Merged-In: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
(cherry picked from 92d41de8f2)
2020-06-18 14:17:57 +00:00
Treehugger Robot
04fe384a31 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: Idc62b60284dfbe98266444ef9d5f65f27df70aaa
2020-06-18 07:27:50 +00:00
Treehugger Robot
7270150164 Merge "Mark jni libs as REQUIRED by their app" 2020-06-18 07:12:33 +00:00
sophiez
cb00590712 NDK api code coverage
Update parsed NDK api xml file directory name.

Test: m ndk
Forrest test build pass: http://shortn/_E5mhRtD4zW

Change-Id: Ic20780d969e33103c45953c9cdd81efe4262b4a9
2020-06-17 23:01:21 +00:00
Martin Stjernholm
34012c5e06 Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406

Change-Id: I5f3c1a3b05b213fa71ce0aca1368712d32e1b965
2020-06-17 17:43:07 +00:00
Martin Stjernholm
2c38eb2537 Merge "Propagate TARGET_BUILD_APPS to Soong." 2020-06-17 17:31:24 +00:00
Sophie Zheng
a38bfeab4e Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: If764d1dbfd02585f94249a5f16f010b667e040b6
2020-06-17 17:26:23 +00:00
Sophie Zheng
b5bfbab22b Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" 2020-06-17 17:11:32 +00:00
Treehugger Robot
f775227f30 Merge "Skip mount /oem on GSI" am: 03db4fbbb7
Original change: https://android-review.googlesource.com/c/platform/build/+/1331103

Change-Id: I628f251c537a32521fc503189ecf7d7ed3f16a4a
2020-06-17 08:38:00 +00:00
Treehugger Robot
03db4fbbb7 Merge "Skip mount /oem on GSI" 2020-06-17 08:21:23 +00:00
Martin Stjernholm
74920e6e43 Propagate TARGET_BUILD_APPS to Soong.
Used to select SDK variants of native libraries when building unbundled
apps only. This allows unbundled modules to access the platform
variants (and typically their versioned APEX stubs).

Test: m (on AOSP master)
Test: TH (including ub-launcher3-master)
Bug: 157549171
Change-Id: I74f0bcebe8b66b81b2c80e9d448f5d24dc9ab991
2020-06-17 04:15:00 +01:00
Treehugger Robot
e2e3df64b0 Merge "Refactor how MODULES-IN-* is defined" am: 0c263fd271
Original change: https://android-review.googlesource.com/c/platform/build/+/1326241

Change-Id: I2d58399908c706496ae841db5648e644c8a8730e
2020-06-17 01:40:41 +00:00
Treehugger Robot
0c263fd271 Merge "Refactor how MODULES-IN-* is defined" 2020-06-17 01:26:20 +00:00
Colin Cross
74f121d18f Rename Native_coverage to GcovCoverage in Soong
Pass the NATIVE_COVERAGE Make variable to Soong as the more accurate
GcovCoverage.  Also remove NATIVE_LINE_COVERAGE, it doesn't do anything
different from NATIVE_COVERAGE, and NATIVE_COVERAGE is always set when
NATIVE_LINE_COVERAGE is set.

Bug: 159059537
Test: m checkbuild
Change-Id: Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19
2020-06-16 18:01:52 -07: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
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
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
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
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
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
b502030f63 Merge "Rename native code coverage paths product variables in Make." am: d160a49df3
Original change: https://android-review.googlesource.com/c/platform/build/+/1325807

Change-Id: Ia7fdcf8a57ccf9948ec2a5ab05ddd6d1c9b1a7ef
2020-06-15 10:18:46 +00:00
Jiyong Park
2e906be272 Merge "Organize product vars for adding properties" am: cd0c931b89
Original change: https://android-review.googlesource.com/c/platform/build/+/1320376

Change-Id: Id8285f633edac03b629c8426950185f2007cb9f9
2020-06-15 10:18:30 +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
Tianjie Xu
916b0cc0bc Merge "Fix the read on a closed zipfile" am: b5b25409b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1332612

Change-Id: I7524b4e9d512a32b89af8d125dc30b731807e282
2020-06-12 22:55:18 +00:00
Tianjie Xu
b5b25409b9 Merge "Fix the read on a closed zipfile" 2020-06-12 22:38:49 +00:00
SzuWei Lin
f8475cc49f Skip mount /oem on GSI
GSI self contains the full Android system part. Skip mounting
the oem partition on GSI, which is a part of system.

Bug: 158433698
Test: build aosp_arm64-userdebug.
Test: Check the file /system/system_ext/etc/init/config/skip_mount.cfg
Change-Id: I689e1cc8a68b980d68b1d6ef1d715203db078dc2
2020-06-12 16:25:44 +08:00
Tianjie
eb06afb602 Fix the read on a closed zipfile
When calculating the dynamic fingerprints, we need to reopen the
input file if it's a ZipFile. Because the original object has been
closed.

Bug: 152167826
Test: generate an OTA package with zip input and overrides
Change-Id: I623da3cc5fcc91c6230fb5a6e86517ed995913b7
2020-06-11 22:51:07 -07:00
Treehugger Robot
31508fb715 Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" am: 9d54fbebcb
Original change: https://android-review.googlesource.com/c/platform/build/+/1332834

Change-Id: I9a2f8e6ab0d1cede6702395a1c29583482f42736
2020-06-12 04:37:52 +00:00
Treehugger Robot
9d54fbebcb Merge "Fix dependencies on INSTALLED_RECOVERYIMAGE_TARGET" 2020-06-12 04:22:25 +00:00
Treehugger Robot
4cbab13de1 Merge "Use inclusive language in build/make" am: 2158d2ec6b
Original change: https://android-review.googlesource.com/c/platform/build/+/1331933

Change-Id: I4e18a8ac71d0bd62a5210e44ce393c476c28b810
2020-06-12 03:34:52 +00:00