Commit Graph

20342 Commits

Author SHA1 Message Date
Ulyana Trafimovich
eb30a00be9 Merge "Rename dexpreopt.config field to bring it in sync with Make." am: f3f654a764
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331926

Change-Id: Ic5d5ed1d523d8678279a2e43e991cbf45c29850d
2020-06-15 08:53:58 +00:00
Ulyana Trafimovich
f3f654a764 Merge "Rename dexpreopt.config field to bring it in sync with Make." 2020-06-15 08:42:13 +00:00
Chih-hung Hsieh
f5760aada6 Merge "Fix module name when autogenerating test config" am: 000aef69b5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332077

Change-Id: Id2dd60c9b3d116330b12291c7a7a5ab39b349a71
2020-06-12 18:13:46 +00:00
Treehugger Robot
f2ca2846db Merge "apex_sets is added to apexkeys.txt" am: 7a8e0cd23a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331104

Change-Id: If01f91873a558e333303659906bd7eebf91e31eb
2020-06-12 18:13:31 +00:00
Chih-hung Hsieh
000aef69b5 Merge "Fix module name when autogenerating test config" 2020-06-12 18:06:42 +00:00
Treehugger Robot
7a8e0cd23a Merge "apex_sets is added to apexkeys.txt" 2020-06-12 18:03:31 +00:00
Ivan Lozano
78599c2cc5 Merge "Match Rust gcda output to cc via -Z profile-emit." am: f094f1c313
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329395

Change-Id: I1a917e656bea4c6ee67cbdb19ef2ca777f7011fd
2020-06-12 16:28:32 +00:00
Ivan Lozano
7a5615d233 Merge "Make rust_test file output more similar to cc_test." am: 1a1d28888c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331014

Change-Id: Ib9df22a5664c5e5bcc0a9d45af7fb0a307befad3
2020-06-12 16:28:18 +00:00
Jiyong Park
8d6c51ebcc apex_sets is added to apexkeys.txt
apex_sets is a new module type that can be used to deliver pre-signed
APEXes, which previously could be done only via prebuilt_apex.

Soon gnow understands apex_sets module types and emits the signing info
of the modules to apexkeys.txt

Bug: 158729168
Test: m
Change-Id: I9507375342ec053309660d94c931a79bf4f21218
2020-06-13 01:24:51 +09:00
Ivan Lozano
f094f1c313 Merge "Match Rust gcda output to cc via -Z profile-emit." 2020-06-12 16:12:48 +00:00
Ivan Lozano
1a1d28888c Merge "Make rust_test file output more similar to cc_test." 2020-06-12 16:12:28 +00:00
Ulya Trafimovich
6e82748bd6 Rename dexpreopt.config field to bring it in sync with Make.
Different names of the same field in Make and in Soong resulted in
the field being dropped when unmarshalling the JSON from Make to Soong.
As a result, the list of optional used libraries for Make modules was
always empty.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: Cherry-pick in internal master and observe that the logcat error
    "ClassLoaderContext shared library size mismatch" for GoogleDialer
    has disappeared:
    terminal-1 $ lunch cf_x86_phone-userdebug && m && launch_cvd
    terminal-2 $ adb wait-for-device && adb root \
        && adb logcat | grep 'size mismatch'
    (nothing after the change, one error message before the change)

Bug: 132357300
Change-Id: I57820646fa7c1d8af01b2cbc8a3521da450719c0
2020-06-12 14:47:50 +01: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
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
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
Jaewoong Jung
3d14ab7b2b Merge "Make override modules compatible with prebuilts." 2020-06-12 01:15:45 +00:00
Stephen Crane
b7fd37cb08 Fix module name when autogenerating test config
c5b8749853 broke specifying a name via the
`autogenTemplateWithName` function by hard-coding
`ctx.ModuleName()`. This restores that functionality.

Bug: 158784626
Test: atest rustBinderTest_integration
Change-Id: I05674e85defb363aa3cdf3e2dd895d1174e6b48f
2020-06-11 23:22:09 +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
Ivan Lozano
fc80fe7f2f Make rust_test file output more similar to cc_test.
This changes the way the output filename is calculated for rust_test
binaries to be more similar to cc_test.

This also removes the option to define multiple test binaries in a
single rust_test module via the TestPerSrc mutator. Now each rust_test
module corresponds to a single test binary.

Bug: 158500462
Test: m -j pin-utils_tests_pin_utils
Test: m -j unicode-xid_device_tests_unicode_xid
Change-Id: I6e0f79dcb4e49fa49d6ebb36abeef67a9eb180a0
2020-06-11 17:12:19 -04: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
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
Ivan Lozano
f3717eec6c Match Rust gcda output to cc via -Z profile-emit.
Use the -Z profile-emit flag to ensure that rust gcda files have
/proc/self/cwd/ appended to them similar to cc modules. This makes sure
our gcda output is consistent no matter what language the binary is
written in.

Bug: 156482307
Test: gcda outputs to the new path.

Change-Id: Ife4d55f885c7e33dffa66f7436bc2bf8b5916586
2020-06-11 17:16:27 +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
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
73759b9a5d Merge "Fix on-device paths to used libraries in dexpreopt." am: 69bd288409
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326319

Change-Id: I0ae80438d2e6971173d66c4ab718cd3f8a6a47c1
2020-06-11 13:57:52 +00:00
Ulyana Trafimovich
69bd288409 Merge "Fix on-device paths to used libraries in dexpreopt." 2020-06-11 13:47:19 +00:00
Ulyana Trafimovich
46560dfdf3 Merge "Remove host boot image from boot.zip." am: 5cdb051ce3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1328974

Change-Id: I09612bb018b4ede636fa2035c277ba3b1afcb106
2020-06-11 10:27:45 +00:00
Martin Stjernholm
f80b698957 Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: fa096325fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324491

Change-Id: I0964289e33d6f567eff69fc80a1f08ba24f77f68
2020-06-11 10:26:08 +00:00
Ulyana Trafimovich
5cdb051ce3 Merge "Remove host boot image from boot.zip." 2020-06-11 10:04:58 +00:00
Martin Stjernholm
fa096325fe Merge changes from topics "target-build-unbundled", "unbundled-preopt"
* changes:
  Don't disable dexpreopting implicitly in unbundled builds.
  Add TARGET_BUILD_UNBUNDLED as a variable to control builds.
2020-06-11 10:01:59 +00:00
Thiébaud Weksteen
e4d12a0468 Add rust-project.json generator
Because we are not relying on Cargo.toml for our crate dependencies,
we need to provide a structured file to rust-analyzer which describes
the locations of the crates. Add a generator for that purpose, similarly
to cc/compdb and cc/ccdeps.

Bug: 156395307
Test: SOONG_GEN_RUST_PROJECT=1 m nothing && \
      cat ${ANDROID_BUILD_TOP}/out/soong/rust-project.json
Change-Id: I46efe0adeddae281eaf86707504c3aa15b5e80b8
2020-06-11 11:22:31 +02:00
Treehugger Robot
4019a06c3c Merge "Update LLVM toolchain to r383902b." am: 9f42bb8822
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329715

Change-Id: I865ed02fedfdbb6405647f187998edb9cc2b29b1
2020-06-11 08:55:44 +00:00