Commit Graph

24213 Commits

Author SHA1 Message Date
Tianjie Xu
0b1791510a Merge "Add lz4 to otatools" am: be46f482e0 am: 387907b462
Original change: https://android-review.googlesource.com/c/platform/build/+/1348968

Change-Id: I7e0e1734264558a80af53ab5869d3247c4b1f56a
2020-06-25 00:10:49 +00:00
Tianjie Xu
be46f482e0 Merge "Add lz4 to otatools" 2020-06-24 23:38:49 +00:00
Colin Cross
0bd0e1bb69 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610 am: 09ee73f2a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: Ic71f7ecd3dbc384957dc671013eb7772ab7311d2
2020-06-24 22:24:54 +00:00
Colin Cross
e1ab4cb610 Merge "Use inclusive language in build/make part 2" 2020-06-24 21:58:46 +00:00
Colin Cross
d1cbfeaa3a Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
2020-06-24 12:03:08 -07:00
Tianjie
3031c29905 Add lz4 to otatools
A call to lz4 was added in http://go/aog/1329115. But the binary
isn't added to otatools, leading to a signing failure.

Bug: 159656873
Test: build otatools
Change-Id: I9cab00f36ce3c39cc174b4c9feffdf360f0364ef
2020-06-24 11:20:36 -07:00
Roland Levillain
02a69dade0 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326 am: 053e972a22
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: Ia66d95b0f81d6f8cb75d2dbc9dc36a5806dea5e1
2020-06-24 10:57:31 +00:00
Roland Levillain
4a203a6326 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." 2020-06-24 10:16:03 +00:00
Colin Cross
94fc2475d3 Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2 am: c018eacb4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: If47bc26c8e1f7d09da94a5a5b185a2d77679d7d8
2020-06-23 03:37:05 +00:00
Colin Cross
5c0acab3e2 Merge "Rename Native_coverage to GcovCoverage in Soong" 2020-06-23 03:06:53 +00:00
Treehugger Robot
226670a93d Merge "Remove vts10 dependencies" am: 8eba18759b am: 9fdd152da4
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: I6a722ad784210bc40189cee65fc3ec77c03bd3a2
2020-06-23 02:43:26 +00:00
Treehugger Robot
8eba18759b Merge "Remove vts10 dependencies" 2020-06-23 02:11:30 +00:00
Ryan Prichard
138cd7b49b Merge "Unlist libunwind as a critical component" am: b636b0cfb8 am: 4b5c043b93
Original change: https://android-review.googlesource.com/c/platform/build/+/1344920

Change-Id: I2994a0da22cd4982b4efcc7202c4bf7ddd1c2392
2020-06-22 21:50:41 +00:00
Ryan Prichard
b636b0cfb8 Merge "Unlist libunwind as a critical component" 2020-06-22 21:17:07 +00:00
J. Avila
fb5d223ea0 Merge "Switch to using llvm-strip for modules" am: dbbd970d18 am: 422a1aec8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1344918

Change-Id: Id0af7c1be1d0c8c1ca30b66fd276c15bd33671df
2020-06-22 15:53:09 +00:00
J. Avila
dbbd970d18 Merge "Switch to using llvm-strip for modules" 2020-06-22 15:19:26 +00:00
Chris Gross
84b32c2ded Merge "Use BUILD_*_IMAGE flags in add_img_to_target_files." am: e08e40947b am: d169a3fcad
Original change: https://android-review.googlesource.com/c/platform/build/+/1321954

Change-Id: Id29c2ab31d3a64146d601dee437adf2773b84466
2020-06-19 23:07:13 +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
8403ae3c95 Merge "adjust vendor ramdisk file extension based on compression" am: 5dda5caeb9 am: cd9ebd46ab
Original change: https://android-review.googlesource.com/c/platform/build/+/1344080

Change-Id: I72cea6daa02264241f851844ca7c0f30d82a3ca1
2020-06-19 07:01:33 +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
TreeHugger Robot
3e48036c15 Merge "notice files in system_other becomes included in system's one" into rvc-dev am: 22f98f1885
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11910080

Change-Id: I1c20546b4b937b13333d3256a7f8aacc5ef8161b
2020-06-19 01:40:58 +00:00
TreeHugger Robot
22f98f1885 Merge "notice files in system_other becomes included in system's one" into rvc-dev 2020-06-19 01:23:26 +00:00
Sophie Zheng
4ed1925587 Merge "NDK api code coverage" am: 34fe2651ed am: 5a8764a6a7
Original change: https://android-review.googlesource.com/c/platform/build/+/1342181

Change-Id: I3206b6a5915bdf9ea46b80b523428876f9e8662b
2020-06-18 20:00:24 +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
046d37d84f Merge "Remove use of metalava compatible output" am: efc6dfb703 am: 31dff639b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1324659

Change-Id: Ibf3f2d7efd1d054970a6ea43e66b08291f00d753
2020-06-18 18:24:29 +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
Paul Duffin
b96c9c352f Merge "Fail check-boot-jars if boot jar contains 0 .class files" into rvc-dev am: c5fd7066f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/11895739

Change-Id: I169c520207e748f01ab6119dffa901e5f3cfb68b
2020-06-18 12:30:31 +00:00
Jeongik Cha
9917520fc2 notice files in system_other becomes included in system's one
system_other is relevant partition to system over vendor.
so move notice files from system_other from vendor to system

Bug: 159189171
Test: m nothing && check ninja dependency
Change-Id: Ib69bd3faae03f174671d5db8366a59b7d28a9d9d
2020-06-18 20:44:51 +09:00
Treehugger Robot
fe6a129cb3 Merge "Mark jni libs as REQUIRED by their app" am: 7270150164 am: 04fe384a31
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: I84acec731634c77ba55851193258e070fa9871c7
2020-06-18 08:15:02 +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
bdaca3a793 Merge "Propagate TARGET_BUILD_APPS to Soong." am: 2c38eb2537 am: 34012c5e06
Original change: https://android-review.googlesource.com/c/platform/build/+/1336406

Change-Id: I0bafa9d0165d1b0590240a57d7a88f686661aa16
2020-06-17 17:49:02 +00:00
Sophie Zheng
fbfb207232 Merge "Revert "Revert "Copy generated xml file for NDK api coverage to dist when CLANG_COVERAGE flag set.""" am: b5bfbab22b am: a38bfeab4e
Original change: https://android-review.googlesource.com/c/platform/build/+/1336765

Change-Id: I23f88fcd3b1f8e5f13b01a9ca37629c96308e623
2020-06-17 17:42:54 +00:00
Martin Stjernholm
2c38eb2537 Merge "Propagate TARGET_BUILD_APPS to Soong." 2020-06-17 17:31:24 +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
Paul Duffin
92d41de8f2 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
Change-Id: I0e8ebd318312949bc58ba7a5c89f9e265b8bedf2
2020-06-17 17:38:24 +01: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
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
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
TreeHugger Robot
6df396f96f Merge "Include image descriptor of only the first boot image in vbmeta" into rvc-dev 2020-06-17 00:46:40 +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
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
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
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