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
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
Matthew Maurer
739edbc0bc
Merge "Update the Rust prebuilt version number to 1.56.1"
2021-11-10 23:57:44 +00:00
Cole Faust
591a1fe158
Make handleSimpleStatement also handle if statements
...
This simplifies its usage, as it can now handle
virtually any Make node.
Bug: 201700692
Test: go test
Change-Id: I1786a441a706304673ea4a2973a21f93b95b945a
2021-11-10 15:09:39 -08:00
Colin Cross
3108ce17b0
Add dependency from hostdex installed module to Make intermediates
...
The art tests rely on a dependency existing from
out/host/linux-x86/framework/core-oj-hostdex.jar to
out/host/common/obj/JAVA_LIBRARIES/core-oj-hostdex_intermediates/classes.jar,
override LOCAL_SOONG_INSTALLED_MODULE for the hostdex modules so that
soong_java_prebuilt.mk adds the dependency.
Test: art/tools/buildbot-build.sh --host && art/tools/run-libcore-tests.sh '--mode=host' '--variant=X64' --debug
Change-Id: I9412147fc66d5e5f0dae52d522868a37251f781e
2021-11-10 14:38:50 -08:00
Chris Parsons
494eef3dc8
Support host platform cc builds
...
This involves handling of linux-* platforms (identifying them
appropriately as host), disabling unsupported Windows platform, and
denylisting of still-problematic modules.
Test: mixed_droid, with verification that shared library artifacts
originate from bazel-out
Change-Id: Ib52db49a2d2a3c1ff9b76af23fd4f22cfc9182d0
2021-11-10 21:57:15 +00:00
Ivan Lozano
0ff16932dc
Merge "rust: Refactor stripped output file path" am: aa1a9e4086
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883188
Change-Id: If32e2f956ca437a09b743be227a921f7ff568064
2021-11-10 21:51:30 +00:00
Cole Faust
136a1cf5c3
Merge "Enable mk2rbc warnings/errors by default" am: f8ff9cf68c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869698
Change-Id: I9cabb7ba502a071c9d82f6fe2ed4393299392dca
2021-11-10 21:51:24 +00:00
Cole Faust
c41dd72d3b
Convert soong scripts to python 3
...
Except manifest_utils, which is used by
apexer.
Tests run:
m construct_context_test manifest_check_test manifest_fixer_test test_config_fixer_test
out/host/linux-x86/testcases/construct_context_test/x86_64/construct_context_test
out/host/linux-x86/testcases/manifest_check_test/x86_64/manifest_check_test
out/host/linux-x86/testcases/manifest_fixer_test/x86_64/manifest_fixer_test
out/host/linux-x86/testcases/test_config_fixer_test/x86_64/test_config_fixer_test
Bug: 203436762
Test: Tests listed above + presubmits
Change-Id: Ife75b3af1efc871a2d8521d26153a262573bb706
2021-11-10 13:49:27 -08:00
Ivan Lozano
aa1a9e4086
Merge "rust: Refactor stripped output file path"
2021-11-10 21:34:21 +00:00
Cole Faust
f8ff9cf68c
Merge "Enable mk2rbc warnings/errors by default"
2021-11-10 21:29:26 +00:00
Sasha Smundak
ea3bc3a953
Flag 'override' directives.
...
Bug: 201087531
Test: internal
Change-Id: I2e08b126d769b1595172b04a3539e99b3e72cb2b
2021-11-10 13:19:01 -08:00
Ivan Lozano
c2f3eae89f
Merge "rust: Add missing variation -D flags to bindgen." am: fe700e19c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1887235
Change-Id: Idacef9ecf768839d755bf7898a51d45bb43d8875
2021-11-10 21:00:23 +00:00
Ivan Lozano
fe700e19c8
Merge "rust: Add missing variation -D flags to bindgen."
2021-11-10 20:47:39 +00:00
Cole Faust
941fe6f384
Merge "Translate soong_config_get calls to rbc" am: 18e7785f26
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1883264
Change-Id: I6cebc0f7ae49af51d5d942a12891b0aa45f4eaa0
2021-11-10 20:25:31 +00:00
Cole Faust
18e7785f26
Merge "Translate soong_config_get calls to rbc"
2021-11-10 19:46:48 +00:00
Colin Cross
6ea1d5be60
Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ... am: 02ce1e7833
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885956
Change-Id: Id5f2522e8e488aaa69f06a2c01f0443f9cbf1e16
2021-11-10 19:05:11 +00:00
Janis Danisevskis
a9029d1f7e
Add hardware/interfaces/security to rust allow list.
...
Test: N/A
Bug: 205626417
Change-Id: I3a648063c8380074713ce58957e4ac062a331e40
2021-11-10 10:59:46 -08:00
Colin Cross
02ce1e7833
Merge changes Ib3f4ee14,Iac22c9fd,Ibd78758c,I40d8696c,I2a2b10e4, ...
...
* changes:
Fix InstallBypassMake symlink dependencies
Add tests for ctx.InstallFile
Fix OutDir vs SoongOutDir in tests
Fix go vet error
Add missing os.MkdirAll to WriteFileToOutputDir
Use pathtools.WriteFileIfChanged in translateAndroidMk
2021-11-10 18:49:08 +00:00
Ivan Lozano
e950cdad6d
rust: Add missing variation -D flags to bindgen.
...
rust_bindgen calls are missing a large set of -D cflags which control
how headers are interpretted for certain variations (such as
-D__ANDROID_VNDK__). This CL introduces the full set of these flags.
Bug: 205609024
Test: rust_bindgen vendor variant builds correctly.
Change-Id: Id781c1f88352e9c238c49619f0dce20f804cfc77
2021-11-10 13:28:55 -05:00
Treehugger Robot
6568ea9f2a
Merge "Add symlinks to Soong-installed sh_binary" am: 3d3aa7038b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1886234
Change-Id: I029e89173d4529d940cf4df50ab529faa7ad03ba
2021-11-10 18:05:51 +00:00
Treehugger Robot
3d3aa7038b
Merge "Add symlinks to Soong-installed sh_binary"
2021-11-10 17:49:26 +00:00
Lukács T. Berki
ea3a89b78b
Merge "Make bgplob an exception to dangling rule check." am: 9303cd6f87
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1885517
Change-Id: Ia3838360057d357d44ca958f06ea5ff41f836de0
2021-11-10 17:29:12 +00:00
Treehugger Robot
03a3ea3885
Merge changes from topic "soong-java-install" am: 8a709b149b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1881031
Change-Id: Id24ad8c9c6a27df20323c40fb3b350bc239bb7be
2021-11-10 17:28:54 +00:00