Commit graph

46786 commits

Author SHA1 Message Date
Rupert Shuttleworth
c0d9f8bd5e Merge "Allow libbuildversion to build with Bazel, but skip its 'tests' subdir for now." 2021-11-15 09:00:12 +00:00
Sophie Zheng
2a27e47fbd Merge "Java APIs used by Mainline modules." am: 7b5fa4277f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887228

Change-Id: I2af77f52c7d56b7dccdf83d19cb0121aa648b3d7
2021-11-15 06:59:16 +00:00
Sophie Zheng
7b5fa4277f Merge "Java APIs used by Mainline modules." 2021-11-15 06:40:31 +00:00
Ivan Lozano
f3e8fc3f0b rust: Only apply hwasan flags once to fuzz targets
On HWASAN global sanitized builds, fuzz targets had hwasanFlags applied
twice. Rust only allows llvm-args flags to be passed in once however, so
this broke compilation.

Bug: 204915322
Test: SANITIZE_TARGET='hwaddress fuzzer' m <fuzzer>
Change-Id: I4f6c35e04bc4c891d9c66e8a53c3dcb88e8670cf
2021-11-13 07:46:05 -05:00
Colin Cross
4c05008f42 Merge "Mark vndkLibrariesTxt modules as device modules" am: cb16a92ee4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889921

Change-Id: I3487c58d6f641773558b3720941f8a894efa762a
2021-11-12 23:46:10 +00:00
sophiez
0234737f30 Java APIs used by Mainline modules.
Add scripts to generate java APIs used by Mainline modules. This is
aosp/1879177 with fixed build error that caused by dexdeps analyzing
resource only APKs which doesn't contains any .dex files. Now skip the
error generates in that case in gen_java_usedby_apex.sh

Forrest run:https://android-build.googleplex.com/builds/abtd/run/L38900000951898586

Test: TARGET_BUILD_APPS=com.android.adbd m dist apps_only
Change-Id: Id539cbe1b7306ace69c047f95ffc02265a467511
2021-11-12 23:39:35 +00:00
Colin Cross
cb16a92ee4 Merge "Mark vndkLibrariesTxt modules as device modules" 2021-11-12 23:30:51 +00:00
Treehugger Robot
350f901177 Merge "Allow open-dice to build tests for generatied open-dice rust bindings." am: 70275c031e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890803

Change-Id: If1966448b218ccd38f20241294ccc3f320c8114d
2021-11-12 20:57:42 +00:00
Daniel Norman
e19437e8f7 Adds multi_install_skip_symbol_files field (default false) to apex.
Multi-installed APEXes share the same apex_name and are installed
at the same time.

Should be set to true for all multi-installed APEXes except the singular
default version within the multi-installed group.
Only the default version can install symbol files in $(PRODUCT_OUT}/apex,
or else conflicting build rules may be created.

Bug: 199290365
Test: see https://r.android.com/1872018
Change-Id: I0cd9d748d7be3a2de40ed14f13bad71912457ddc
2021-11-12 20:45:50 +00:00
Treehugger Robot
70275c031e Merge "Allow open-dice to build tests for generatied open-dice rust bindings." 2021-11-12 20:38:53 +00:00
Janis Danisevskis
73f2104588 Allow open-dice to build tests for generatied open-dice rust bindings.
Test: N/A
Bug: 205626417
Change-Id: Iafa79f07005b9863468252828c74ee199279c457
2021-11-12 20:33:49 +00:00
Ivan Lozano
00713727b7 Merge "rust: Support new rust_stdlib_prebuilt_host type" am: 52a3e36c92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1888868

Change-Id: I4a554b7dfd9827a9c65ebf31e099c5de6d5a75a2
2021-11-12 19:50:08 +00:00
Ivan Lozano
b84c426099 Merge changes I26198187,Ia904d07b am: 94e8a651fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1877339

Change-Id: I07a8f5583e867b0c395ec42540ea8448a2bc6a2c
2021-11-12 19:45:01 +00:00
Ivan Lozano
52a3e36c92 Merge "rust: Support new rust_stdlib_prebuilt_host type" 2021-11-12 19:35:03 +00:00
Ivan Lozano
94e8a651fa Merge changes I26198187,Ia904d07b
* changes:
  rust: Support MTE memtag_heap sanitizer
  rust: Support global sanitizers
2021-11-12 19:26:04 +00:00
Cole Faust
5abf961c8d Merge "Convert soong scripts to python 3" am: 4220a61349
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886447

Change-Id: I4c51bb28214d384e8f66b5cba92c71897604912a
2021-11-12 19:15:17 +00:00
Colin Cross
35ee47dcbf Merge "Revert "Move apex module installation into Soong"" am: 152911f807
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1890806

Change-Id: Iaa000333e09fd0a87738c66709f4c390f80a36b4
2021-11-12 19:15:13 +00:00
Cole Faust
9585062240 Merge "Make handleSimpleStatement also handle if statements" am: 80374405df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885112

Change-Id: I1e05d7e665ae80d657d7a67556749072fc8731e9
2021-11-12 19:15:06 +00:00
Cole Faust
4220a61349 Merge "Convert soong scripts to python 3" 2021-11-12 19:04:31 +00:00
Colin Cross
152911f807 Merge "Revert "Move apex module installation into Soong"" 2021-11-12 19:02:30 +00:00
Cole Faust
80374405df Merge "Make handleSimpleStatement also handle if statements" 2021-11-12 19:01:41 +00:00
Colin Cross
ccba23db44 Revert "Move apex module installation into Soong"
This reverts commit e3d156a622.

Reason for revert: b/206119621

Bug: 204136549
Change-Id: I380223b86660c27bea8f5dcc2d61f32df2704c02
Fixes: 206119621
2021-11-12 19:01:29 +00:00
Ivan Lozano
d06cc748c1 Use new soong_cc_rust_prebuilt.mk
soong_{cc,rust}_prebuilt.mk has been merged. Use the new file.

Bug: N/A, clean-up
Test: m
Change-Id: I3f03e866815f6394aacd8cb0deba04f381b78c29
2021-11-12 13:27:58 -05:00
Colin Cross
8dfdabc4c9 Merge "Move apex module installation into Soong" am: 4e278e5f68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1880605

Change-Id: I152ae7b450c21f0e6c5839cc7f52f9ae2fb1b457
2021-11-12 17:21:00 +00:00
Colin Cross
45bce85fc9 Mark vndkLibrariesTxt modules as device modules
vndkcorevariant.libraries.txt needs to be installed onto the device,
mark the vndkLibrariesTxt module type as a device module so that
PathForModuleInstall returns a path in the system partition.

Bug: 204136549
Test: m checkbuild
Change-Id: Ic2aadff27cee6a5e6352ceaf61b707ad3e5b531f
2021-11-12 09:12:22 -08:00
Colin Cross
4e278e5f68 Merge "Move apex module installation into Soong" 2021-11-12 17:06:08 +00:00
Ivan Lozano
fba2aa255c rust: Support new rust_stdlib_prebuilt_host type
Refactor Rust prebuilts to support the new rust_stdlib_prebuilt_host
module type, and change the format for depending on the prebuilt host
stdlibs.

Bug: 140642453
Test: m
Change-Id: Ifbc4741818777934e917631c788b20911856c44a
2021-11-12 08:58:17 -05:00
Colin Cross
dbeb6b2eb7 Merge "Add .PHONY for dist-for-goals targets" am: 8432238aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889717

Change-Id: I959165bef217b86ff099592dad47f5f9291fc408
2021-11-12 07:27:41 +00:00
Colin Cross
8432238aa0 Merge "Add .PHONY for dist-for-goals targets" 2021-11-12 07:13:17 +00:00
Alexander Smundak
406e121088 Merge "Display diagnostic message for each conversion error." am: 51977fca61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887516

Change-Id: I5115ea8a41e0a338796939d928dcf0b1688a20a0
2021-11-12 02:50:58 +00:00
Alexander Smundak
51977fca61 Merge "Display diagnostic message for each conversion error." 2021-11-12 02:34:39 +00:00
Colin Cross
e3d156a622 Move apex module installation into Soong
Move apex module installation rules into Soong by overriding
InstallBypassMake.

Soong installs don't support post install commands, so move the
symlinks into separate rules and add dependencies on them.

Bug: 204136549
Test: m checkbuild
Change-Id: If65d283abc86f18ad266da0bf16fe95971a0bf9c
2021-11-11 17:44:42 -08:00
Treehugger Robot
4f80ea196b Merge "Add hardware/interfaces/security to rust allow list." am: 09104df494
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885948

Change-Id: Ib11f4497fb0bc2d805dc1634bf002a7383d0d1cb
2021-11-12 01:15:15 +00:00
Treehugger Robot
09104df494 Merge "Add hardware/interfaces/security to rust allow list." 2021-11-12 00:55:52 +00:00
Kevin DuBois
0a5da7025e sbox: run commands using script for large commands
Linux has limit of 32 pages for a single argument. Sbox's method of
handling commands as a single large string can run into this limitation.

Write the large command to a script file and then execute that file.
This better accommodates the large commands, and leaves a script in the
temporary directory useful for manual inspection if necessary.

Bug: 177070955
Bug: 174232579
Fixes: 202297224
Test: m
Test: make particular target with very long command exceeding limit.
Change-Id: Ia298fdfd7a759821c37f540deaf800026041e511
2021-11-12 00:48:34 +00:00
Colin Cross
b5399c84ff Add .PHONY for dist-for-goals targets
Mac builds don't include build/make/core/tasks/general-tests.mk
which causes the general-tests target not to be marked phony.  Have
Soong mark all dist-for-goals targets as phony so it doesn't rely
on other makefiles being present.

Bug: 205928834
Test: forrest
Change-Id: I9394c9c794fc83cde9649aa12a3039526d8206f3
2021-11-12 00:36:58 +00:00
Sasha Smundak
7d934b9c47 Display diagnostic message for each conversion error.
Also, use better names for the error handling entities.

Bug: 204062171
Test: manual
Change-Id: I65869120ed08fc40d9ec6267c882e53aaedde9ed
2021-11-11 15:14:20 -08:00
Chris Parsons
998284da66 Remove modules from denylist after host C++ support am: 393002a913
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1889455

Change-Id: I2289ad65d279cb496c9da43a1a6de3484cac9de7
2021-11-11 19:47:00 +00:00
Chris Parsons
393002a913 Remove modules from denylist after host C++ support
Test: mixed_droid
Change-Id: If9b04625b0ad4fce52283eb683f1342e24bb97f2
2021-11-11 13:56:56 -05:00
Christopher Parsons
063cd58d11 Merge "Support host platform cc builds" am: 4f5b548e74
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885868

Change-Id: I097ad09de5c237fda8c5d8a493afdc82e3bffce3
2021-11-11 17:30:28 +00:00
Christopher Parsons
4f5b548e74 Merge "Support host platform cc builds" 2021-11-11 17:18:15 +00:00
Trevor Radcliffe
347e5e4307 Document possible values of sdk_version
Fixes: 205166295
Test: Look at docs
Change-Id: Ice6cf61b8628c529dc28c3b02e83bec93e952461
2021-11-11 15:36:53 +00:00
Treehugger Robot
0a93afc2b9 Merge changes I9e38ac73,I9412147f am: 45da465ef6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887532

Change-Id: Iafcd3607b170c25f1585bf152397ee86105c8be4
2021-11-11 06:28:38 +00:00
Treehugger Robot
45da465ef6 Merge changes I9e38ac73,I9412147f
* changes:
  Honor PreventInstall for APKs and dexpreopt files
  Add dependency from hostdex installed module to Make intermediates
2021-11-11 06:10:26 +00:00
Treehugger Robot
17550eb4a0 Merge "Dump deps for native and java to json files." am: 008d17612a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878094

Change-Id: I3a9b537606b6c39d9d89a4e289aab29b44550a4a
2021-11-11 04:49:34 +00:00
Treehugger Robot
008d17612a Merge "Dump deps for native and java to json files." 2021-11-11 04:48:16 +00:00
Treehugger Robot
5f46e246aa Merge "Flag 'override' directives." am: 2a8105d19e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887515

Change-Id: Ib6640605a722410a026c710dc2bab66d45bf7f0e
2021-11-11 03:34:38 +00:00
Treehugger Robot
2a8105d19e Merge "Flag 'override' directives." 2021-11-11 03:17:11 +00:00
Colin Cross
fa9bfcd0d2 Honor PreventInstall for APKs and dexpreopt files
Native coverage builds create a second variant of APKs and set
PreventInstall on the non-coverage variant.  Skip calling
ctx.InstallFile for APKs and in dexpreopt when PreventInstall
is set.

Fixes: 205865567
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device external/compiler-rt external/clang external/llvm external/swiftshader/third_party/llvm-10.0"
Change-Id: I9e38ac737315db12475e8f9bfb3e0e7c0327fc06
2021-11-10 16:42:38 -08:00
Matthew Maurer
534240991e Merge "Update the Rust prebuilt version number to 1.56.1" am: 739edbc0bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1867226

Change-Id: I76629a7decc0131915688b01f82be96141091704
2021-11-11 00:13:21 +00:00