Jaewoong Jung
0845a8aba3
Merge "Revert "Add module name to sh_test install path."" am: fe25dc9f3b
am: 2f9974deb5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331751
Change-Id: I30f6d02228094ac21ede126035ac56aec43bca27
2020-06-13 02:50:57 +00:00
Colin Cross
973d6813cd
manual merge of 2ef16cfcd4
to rvc-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I768c3fe568fee764cb0b533e73a3fef719adf30c
2020-06-12 17:49:09 -07:00
Jaewoong Jung
2f9974deb5
Merge "Revert "Add module name to sh_test install path."" am: fe25dc9f3b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331751
Change-Id: I34af9a333a642422f002101643b64ba0f8ff3f37
2020-06-12 04:25:28 +00:00
Jaewoong Jung
fe25dc9f3b
Merge "Revert "Add module name to sh_test install path.""
2020-06-12 04:08:28 +00:00
TreeHugger Robot
6f80e0517d
[automerger skipped] Merge "Make override modules compatible with prebuilts." into rvc-dev am: ddac56e375
-s ours
...
am skip reason: Change-Id I859b35c0629b2b6258dd1ec5e020ba2c77ff9612 with SHA-1 fb25a64fdd
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11835323
Change-Id: I854d2747c39fd4e95575ee12b5bc904f1984503b
2020-06-12 03:56:06 +00:00
TreeHugger Robot
ddac56e375
Merge "Make override modules compatible with prebuilts." into rvc-dev
2020-06-12 03:44:53 +00:00
Treehugger Robot
2ef16cfcd4
Merge "Use inclusive language in build/soong" am: 6db2306c57
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331016
Change-Id: I735a2382fa809eb412b5386c65d6a995511bc9cc
2020-06-12 03:34:52 +00:00
Treehugger Robot
6db2306c57
Merge "Use inclusive language in build/soong"
2020-06-12 03:19:02 +00:00
Ramy Medhat
8660944fa8
[automerger skipped] Merge changes from topic "metalava_sandbox" into rvc-dev am: 8321caa129
-s ours
...
am skip reason: Change-Id I5ca637984429df12fe05bb07f5db154be9b24f97 with SHA-1 c8d60bc7c6
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11830982
Change-Id: I8d37e7cf5318851992f93f0d4080aa4e6763a0cc
2020-06-12 01:40:15 +00:00
Jaewoong Jung
1d6d3f5901
Merge "Make override modules compatible with prebuilts." am: 3d14ab7b2b
am: 3bec2b0468
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332075
Change-Id: I5b45f6a95217552af1b24c34b94c3dc321531a8b
2020-06-12 01:39:30 +00:00
Jaewoong Jung
3bec2b0468
Merge "Make override modules compatible with prebuilts." am: 3d14ab7b2b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332075
Change-Id: I1a88cfc4807bc75d527d9b17541040fbad25094b
2020-06-12 01:27:05 +00:00
Ramy Medhat
8321caa129
Merge changes from topic "metalava_sandbox" into rvc-dev
...
* changes:
Turn on metalava sandbox warning in all droiddoc metalava invocations.
Add support for Metalava implicit dependencies for remote execution.
Add sourcepath to inputs of remoteable metalava action.
Add support for the remote execution of metalava actions.
2020-06-12 01:24:14 +00:00
Jaewoong Jung
e50fe61acc
Make override modules compatible with prebuilts.
...
Prebuilt's prefer flag doesn't work against override modules because
override modules are sort of virtual modules that delegate all the work
to their base modules. Therefore, even if a prebuilt module suppresses
installation of its src-counterpart override module, the actual build
actions are still performed in the base module.
This change fixes it by filtering out override modules that are being
replaced by prebuilts.
Test: prebuilt_test.go
Fixes: 152155285
Change-Id: I859b35c0629b2b6258dd1ec5e020ba2c77ff9612
Merged-In: I859b35c0629b2b6258dd1ec5e020ba2c77ff9612
2020-06-11 18:16:50 -07:00
Jaewoong Jung
3d14ab7b2b
Merge "Make override modules compatible with prebuilts."
2020-06-12 01:15:45 +00:00
Jaewoong Jung
fb25a64fdd
Make override modules compatible with prebuilts.
...
Prebuilt's prefer flag doesn't work against override modules because
override modules are sort of virtual modules that delegate all the work
to their base modules. Therefore, even if a prebuilt module suppresses
installation of its src-counterpart override module, the actual build
actions are still performed in the base module.
This change fixes it by filtering out override modules that are being
replaced by prebuilts.
Test: prebuilt_test.go
Bug: 152155285
Change-Id: I859b35c0629b2b6258dd1ec5e020ba2c77ff9612
2020-06-11 16:01:30 -07:00
Colin Cross
440e0d0542
Use inclusive language in build/soong
...
Test: m checkbuild
Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc
2020-06-11 15:33:16 -07:00
Michael Butler
0c55445b72
Revert "Add module name to sh_test install path."
...
This reverts commit 2d4f1a2f7e
.
Reason for revert: Droidcop: Potential culprit for Bug 158778263 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Bug: 158778263
Change-Id: I5287b3c9331b08925dd22b32c84e4c3b6f71b58a
2020-06-11 21:17:30 +00:00
Colin Cross
0f7b0d3652
Merge changes from topics "dist-for-goals", "soong-dist", "tests-PathForSource" am: 1adc63ec3d
am: 09420fb0a4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1128033
Change-Id: If7ae1d8ddd1af750688626ef330349d67ac808ef
2020-06-11 20:47:07 +00:00
Colin Cross
4aa6fbc9d5
Define Soong phony rules in Make am: c3d87d3112
am: 970fd93b92
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325397
Change-Id: I44eba43a7c316b9cb9696d02962a84d0c1d8ebed
2020-06-11 20:47:03 +00:00
Colin Cross
5dea871f37
Remove paths from cc.TestConfig am: 2fce23ae6d
am: 85f1395958
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325396
Change-Id: Ibc80d2369d826978c27349a95be659ca4d521606
2020-06-11 20:47:00 +00:00
TreeHugger Robot
15901d2b6d
Merge "resolve merge conflicts of a73ffc21e0
to rvc-dev-plus-aosp" into rvc-dev-plus-aosp
2020-06-11 20:46:44 +00:00
Stephen Hines
22c556263d
Update LLVM toolchain to r383902b. am: 26d6b7834c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11835319
Change-Id: I410ec9d9043f7906c2f04a943ad43f858411ac99
2020-06-11 19:52:04 +00:00
Colin Cross
300b266264
resolve merge conflicts of a73ffc21e0
to rvc-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie8ad8a9e91bf4a86c90060b15dc88f9860539637
2020-06-11 12:12:30 -07:00
Treehugger Robot
1a0401be35
Merge "Include runtime-module-host-exports in the SDK build." am: feccfbc5be
am: 425094b784
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331128
Change-Id: Ic52b704d9d3bf483e4433920b5c49f8cbb9d5ab6
2020-06-11 18:45:46 +00:00
Sophie Zheng
346ec3c0b2
Merge "NDK Api Coverage" am: 582bebf051
am: 6574db06ec
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320013
Change-Id: I03e7b09c4c40a8a83f2053304595a0918995ec69
2020-06-11 18:45:20 +00:00
Colin Cross
09420fb0a4
Merge changes from topics "dist-for-goals", "soong-dist", "tests-PathForSource" am: 1adc63ec3d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1128033
Change-Id: Iaa3f5613d7b9f81643971301dce3e6d8931e3250
2020-06-11 18:42:04 +00:00
Colin Cross
970fd93b92
Define Soong phony rules in Make am: c3d87d3112
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325397
Change-Id: Ia6a1f96c75c660525127c25472327dd78ba58124
2020-06-11 18:42:02 +00:00
Colin Cross
85f1395958
Remove paths from cc.TestConfig am: 2fce23ae6d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325396
Change-Id: Ica1f496b45a0e528fd94dc53a1db2478234ddb77
2020-06-11 18:42:00 +00:00
Colin Cross
a73ffc21e0
Remove most paths from java.TestConfig am: 238c1f3903
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325395
Change-Id: I6098307daea68b5d5a56cc83f51934b7dd7d4cf4
2020-06-11 18:41:57 +00:00
Colin Cross
439675bf9d
Allow tests to bypass PathForSource existence checks am: 5e6a797982
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325394
Change-Id: Iba9e38624aef891770a7e64f10ca691462c498b8
2020-06-11 18:41:55 +00:00
Colin Cross
1adc63ec3d
Merge changes from topics "dist-for-goals", "soong-dist", "tests-PathForSource"
...
* changes:
Add DistForGoal to MakeVarsContext
Define Soong phony rules in Make
Remove paths from cc.TestConfig
Remove most paths from java.TestConfig
Allow tests to bypass PathForSource existence checks
2020-06-11 18:36:18 +00:00
Treehugger Robot
425094b784
Merge "Include runtime-module-host-exports in the SDK build." am: feccfbc5be
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331128
Change-Id: Ic2aca6822736e2cf652ca1623478c5f8aa75267b
2020-06-11 18:36:17 +00:00
Sophie Zheng
6574db06ec
Merge "NDK Api Coverage" am: 582bebf051
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1320013
Change-Id: Ifd3e96cdb196c0a899f107257e74195f0fb7f7ea
2020-06-11 18:35:51 +00:00
Treehugger Robot
feccfbc5be
Merge "Include runtime-module-host-exports in the SDK build."
2020-06-11 18:33:10 +00:00
Sophie Zheng
582bebf051
Merge "NDK Api Coverage"
2020-06-11 18:21:39 +00:00
sophiez
58cabb7af6
NDK Api Coverage
...
Enable ndk_library processing for api code coverage. All parsed generated xml files will be dist and later upload to artifacts.
Test: m ndk
Change-Id: I76ac52f60d5bbb106308658cf7417b845af9a49e
2020-06-11 18:18:40 +00:00
Ramy Medhat
7f2006c091
Turn on metalava sandbox warning in all droiddoc metalava invocations.
...
Bug: b/156613606
Test: built aosp crosshatch userdebug with RBE_METALAVA=1 and dependency
file support.
Change-Id: I5ca637984429df12fe05bb07f5db154be9b24f97
Merged-In: I5ca637984429df12fe05bb07f5db154be9b24f97
2020-06-11 17:57:22 +00:00
Ramy Medhat
8e9b63b6ff
Add support for Metalava implicit dependencies for remote execution.
...
Bug: b/156613606
Test: built aosp crosshatch userdebug with RBE_METALAVA=1
Change-Id: Ic64d98785e34717ef9bdad62b4885085f84f132a
Merged-In: Ic64d98785e34717ef9bdad62b4885085f84f132a
2020-06-11 17:57:12 +00:00
Ramy Medhat
46bad760ec
Add sourcepath to inputs of remoteable metalava action.
...
Bug: b/156613606
Test: presubmit
Change-Id: Idd77abddac0a676302226eb62883c74d5d7489af
Merged-In: Idd77abddac0a676302226eb62883c74d5d7489af
2020-06-11 17:55:36 +00:00
Sophie Zheng
3c4ce6c970
Merge "Add ndk api parser for ndk api coverage." am: 52481b445b
am: cba84bf475
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1304641
Change-Id: I256b2b47767a127d40340d8c94fc24648977fd72
2020-06-11 17:46:17 +00:00
Sophie Zheng
cba84bf475
Merge "Add ndk api parser for ndk api coverage." am: 52481b445b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1304641
Change-Id: Ifa41a0f940b6dd7a7240fde3b89b880c360f9d3f
2020-06-11 17:31:13 +00:00
Sophie Zheng
52481b445b
Merge "Add ndk api parser for ndk api coverage."
2020-06-11 17:21:05 +00:00
Jaewoong Jung
fc61cc889c
Merge "Add module name to sh_test install path." am: 9e90e61ffd
am: 2e172f15d1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329728
Change-Id: I5f869bf2eba1db4ca91b03967e13532c13800b76
2020-06-11 17:19:43 +00:00
Jaewoong Jung
2e172f15d1
Merge "Add module name to sh_test install path." am: 9e90e61ffd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329728
Change-Id: I0648044349339f2be10fbfd13516e3e2457bf280
2020-06-11 17:16:10 +00:00
Thiébaud Weksteen
4a14dd2fe8
Merge "Add rust-project.json generator" am: a2e3a6312b
am: 04bb4c4ae9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326311
Change-Id: I9361ee66f17a8e657fea92bed01ded4404c3092b
2020-06-11 17:15:39 +00:00
Jaewoong Jung
9e90e61ffd
Merge "Add module name to sh_test install path."
2020-06-11 16:45:56 +00:00
Thiébaud Weksteen
04bb4c4ae9
Merge "Add rust-project.json generator" am: a2e3a6312b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326311
Change-Id: I1ab7db39cb790bd33a21bb5a6d067a2add31ff6e
2020-06-11 16:18:16 +00:00
Thiébaud Weksteen
a2e3a6312b
Merge "Add rust-project.json generator"
2020-06-11 16:01:07 +00:00
Martin Stjernholm
68b0c7a6e5
Include runtime-module-host-exports in the SDK build.
...
Test: build/soong/scripts/build-mainline-modules.sh
Bug: 152255951
Change-Id: I87a154a31409c83ccdd4637210f6163dfa2d7738
2020-06-11 15:48:13 +01:00
Ulyana Trafimovich
12a10b050f
Merge "Fix on-device paths to used libraries in dexpreopt." am: 69bd288409
am: 73759b9a5d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326319
Change-Id: Iec7143aa2f61c9d5b7b61e8d9510db3a573d794a
2020-06-11 14:23:22 +00:00