openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,132 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

23132 Commits

Author SHA1 Message Date
TreeHugger Robot 4666f7ef3a Merge "Remove libnativehelper modules from whitelist" into rvc-dev-plus-aosp 2020-06-15 15:27:56 +00:00
Treehugger Robot 413fe72e89 [automerger skipped] Merge "java_sdk_library: Add system-server scope" am: 623802f2f2 am: 7036824079 -s ours 
am skip reason: Change-Id I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd with SHA-1 5a757b1ebb is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322696

Change-Id: I1dabb15a7eaf820d902a87734ae64a2c3f83aa6c
 2020-06-15 15:21:05 +00:00
Treehugger Robot 7036824079 Merge "java_sdk_library: Add system-server scope" am: 623802f2f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322696

Change-Id: I542da9bcb6dd3ef0feb0d25f79d46394197f68da
 2020-06-15 15:05:32 +00:00
Treehugger Robot 623802f2f2 Merge "java_sdk_library: Add system-server scope" 2020-06-15 14:52:58 +00:00
Jooyung Han e30c7b98bc Merge "VNDK APEX should not provide native libs" am: 552d4730c3 am: 6b67734812 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335522

Change-Id: Ieaa981ee386de3a31f45a87e60819b25baf98883
 2020-06-15 14:27:50 +00:00
Jooyung Han 6b67734812 Merge "VNDK APEX should not provide native libs" am: 552d4730c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1335522

Change-Id: I4a98e13de0f1abf32b8d8422b4b27f2f1d167a2e
 2020-06-15 14:04:58 +00:00
Paul Duffin 0c5bae5e83 java_sdk_library: Add system-server scope 
Bug: 155164730
Test: m nothing
Merged-In: I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd
Change-Id: I49a2dab5c064b05f16691a3fae65f2b4ffc53bfd
(cherry picked from commit 5a757b1ebb)
 2020-06-15 15:02:19 +01:00
Jooyung Han 552d4730c3 Merge "VNDK APEX should not provide native libs" 2020-06-15 13:52:20 +00:00
Orion Hodson 494c63b20e Remove libnativehelper modules from whitelist 
Bug: 147364041
Test: m nothing
Change-Id: I6a43511fee3feeb164e07d5620eea0564fbee302
Merged-In: I6a43511fee3feeb164e07d5620eea0564fbee302
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit ab67d8f9b4)
 2020-06-15 13:25:59 +00:00
TreeHugger Robot 3af97dc202 [automerger skipped] Merge "Fix type assertion error regarding dex_import" into rvc-dev am: a5fa9f6df9 -s ours 
am skip reason: Change-Id Id22c20d42effce539fab10b0d349bf340d467f02 with SHA-1 9e83f0b531 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11822729

Change-Id: I9c71e73b5297b24ed35b7b2a2e249e4e000a8def
 2020-06-15 10:50:24 +00:00
TreeHugger Robot a5fa9f6df9 Merge "Fix type assertion error regarding dex_import" into rvc-dev 2020-06-15 10:40:17 +00:00
Roland Levillain 5e303f1b31 Merge "Rename native code coverage paths product variables in Soong." am: 2752d926a9 am: c052ef7d33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326320

Change-Id: I1a54d986c3e3080588011bab7469f38144a3d748
 2020-06-15 10:37:09 +00:00
Roland Levillain c052ef7d33 Merge "Rename native code coverage paths product variables in Soong." am: 2752d926a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326320

Change-Id: I2826d4fff0233d98bf59e73aaf3e8bd5a04d1097
 2020-06-15 10:18:46 +00:00
Roland Levillain 2752d926a9 Merge "Rename native code coverage paths product variables in Soong." 2020-06-15 10:12:10 +00:00
Ulyana Trafimovich 7c7fd703b6 Merge "Rename dexpreopt.config field to bring it in sync with Make." am: f3f654a764 am: eb30a00be9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331926

Change-Id: I752a534fb0d2bb977755daf63145229daed29fe7
 2020-06-15 08:59:49 +00:00
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
Jooyung Han 45a96778c1 VNDK APEX should not provide native libs 
While libz has stubs for other mainline modules, it doesn't provide
stubs when it is used as a VNDK lib.

In general, VNDK libs are only for vendor modules. So, we skip them even
if they have stubs.

Bug: 155456180
Test: m com.android.vndk.current
      provideNativeLibs of the APEX should be empty
Change-Id: I22401a2b1732a8560802c5be850181682e183a8e
 2020-06-15 15:14:12 +09:00
Chih-hung Hsieh 37ce4a7061 Merge "Fix module name when autogenerating test config" am: 000aef69b5 am: f5760aada6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1332077

Change-Id: I1e993e597420494b26e00142d82144c0ad795d5a
 2020-06-13 02:51:54 +00:00
Treehugger Robot 0c0583bd6b Merge "apex_sets is added to apexkeys.txt" am: 7a8e0cd23a am: f2ca2846db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331104

Change-Id: Ieec1c09704a14bd670b947590eaba0e8d5ac9805
 2020-06-13 02:51:39 +00:00
Ivan Lozano 7f108c9ae3 Merge "Match Rust gcda output to cc via -Z profile-emit." am: f094f1c313 am: 78599c2cc5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1329395

Change-Id: I66ee99afb22cc1147aed07703e9bcf2add77e010
 2020-06-13 02:51:23 +00:00
Ivan Lozano f00464ecc7 Merge "Make rust_test file output more similar to cc_test." am: 1a1d28888c am: 7a5615d233 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1331014

Change-Id: I1b3866c11f447ea74e4623421b5e14f8dbb10f1a
 2020-06-13 02:51:09 +00:00
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
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 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
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