Commit graph

23224 commits

Author SHA1 Message Date
Jaewoong Jung
2d4f1a2f7e Add module name to sh_test install path.
Bug: 156980228
Test: m ziptool-tests
Test: sh_binary_test.go
Change-Id: Ibb1d774709ea421e18d5350009c203f83c5b2d60
2020-06-10 17:23:46 -07:00
Colin Cross
062103115c Add exclude_shared_libs, expand exclude_static_libs to cover static_libs
Allow variants to exclude shared or static libs.

Bug: 153609531
Test: manual
Change-Id: I6ac9c445ed233c774a051743ed6760058c9918e9
2020-06-10 15:47:34 -07:00
Stephen Hines
b31d77e57c Update LLVM toolchain to r383902b.
Bug: http://b/149417653
Test: m
Change-Id: I0e191b463852da8b5eb5a4e092ef9b5da255df3d
2020-06-10 15:39:31 -07:00
Jaewoong Jung
9c646b161e Use Targets[Android] instead of DeviceArch funcs. am: 829b7135f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11820097

Change-Id: I216e04656108c7d7c7b35d39fa70f82ef656d38a
2020-06-10 21:50:16 +00:00
Jaewoong Jung
829b7135f3 Use Targets[Android] instead of DeviceArch funcs.
NDK prebuit script doesn't set device arch product variables, and so
causes SupportedAbis to panic.

Fixes: 158673325
Test: app_test.go, apex_test.go
Test: build-ndk-prebuilts.sh
Change-Id: I8331ef5bca12301318510ec9712770fd8d3a26a9
2020-06-10 12:30:51 -07:00
Martin Stjernholm
b8f14acafd Merge "Fix duplicate install targets from sdk variants in --skip-make mode." am: d297b77e84 am: 4a644cf9e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322698

Change-Id: I55d5e2a41cdad4f43d656a3afc2e0e83f9f4da09
2020-06-10 18:37:32 +00:00
Elliott Hughes
f48d50bfb7 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4 am: 274a80c492
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I8862a464aa374922dadedd68e47d1705b8ce5836
2020-06-10 18:36:54 +00:00
Martin Stjernholm
4a644cf9e5 Merge "Fix duplicate install targets from sdk variants in --skip-make mode." am: d297b77e84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322698

Change-Id: I7e02972d34498ce7cf83376c0976aae02770833e
2020-06-10 18:26:05 +00:00
Martin Stjernholm
d297b77e84 Merge "Fix duplicate install targets from sdk variants in --skip-make mode." 2020-06-10 18:25:44 +00:00
Elliott Hughes
274a80c492 Merge "Remove TARGET_PREFER_32_BIT support." am: a82ad479a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1289612

Change-Id: I70fbe62a9da538ba484e78c5d9ea4ddbbe416737
2020-06-10 18:25:42 +00:00
Elliott Hughes
a82ad479a4 Merge "Remove TARGET_PREFER_32_BIT support." 2020-06-10 18:07:06 +00:00
Jiyong Park
9e83f0b531 Fix type assertion error regarding dex_import
Ida6f7bb784efe74cc1fa0e8d370eaee803f08b0f made it possible to add
dex_import modules into apex, but that change had a bug. When creating
Android.mk for the dex_import module, the code executed an unchecked
type assertion to convert java.DexImport to java.Dependency, which
cannot be successful. This change fixes the bug by doing a checked type
assertion instead.

Bug: 157886942
Test: m (test added)
Change-Id: Id22c20d42effce539fab10b0d349bf340d467f02
2020-06-11 00:35:03 +09:00
Ulya Trafimovich
9ab4933a1c Remove host boot image from boot.zip.
Host boot image is not needed in boot.zip, which is used for the ART
APK scanner and runs on target. This commit also changes the paths in
the boot.zip by removing OS subdirectory.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: m out/soong/vsoc_x86/dex_bootjars/boot.zip \
    && zipinfo -1 out/soong/vsoc_x86/dex_bootjars/boot.zip
    system/framework/x86/boot-framework.art
    system/framework/x86/boot-framework.oat
    system/framework/x86/boot-ext.art
    system/framework/x86/boot-ext.oat
    system/framework/x86/boot-core-icu4j.art
    system/framework/x86/boot-core-icu4j.oat
    system/framework/x86/boot-telephony-common.art
    system/framework/x86/boot-telephony-common.oat
    system/framework/x86/boot-voip-common.art
    system/framework/x86/boot-voip-common.oat
    system/framework/x86/boot-ims-common.art
    system/framework/x86/boot-ims-common.oat
    system/framework/x86/boot-framework-atb-backward-compatibility.art
    system/framework/x86/boot-framework-atb-backward-compatibility.oat
    system/framework/x86/boot-framework.vdex
    system/framework/x86/boot-ext.vdex
    system/framework/x86/boot-core-icu4j.vdex
    system/framework/x86/boot-telephony-common.vdex
    system/framework/x86/boot-voip-common.vdex
    system/framework/x86/boot-ims-common.vdex
    system/framework/x86/boot-framework-atb-backward-compatibility.vdex

Change-Id: Idf0541908059c454348181d90b0b3e5d6d350057
2020-06-10 15:54:23 +01:00
Ulya Trafimovich
9f3052cd78 Fix on-device paths to used libraries in dexpreopt.
Test: lunch aosp_cf_x86_phone-userdebug && m
Test: Cherry-pick in internal master and check that on-device path to
    com.google.android.dialer.support.jar now is on /product partition
    (as it should be) and not on /system:
    $ oatdump \
        --instruction-set=x86 \
        --oat-file=out/target/product/vsoc_x86/product/priv-app/GoogleDialer/oat/x86/GoogleDialer.odex \
      | grep '^classpath' \
      | grep -o '[^[]*com.google.android.dialer.support.jar'
    /product/framework/com.google.android.dialer.support.jar

Bug: 132357300
Change-Id: Idf279ac713b9b29ff3a29f1b072bc1d57f48db26
2020-06-10 14:53:36 +01:00
Paul Duffin
01c577968a Merge "java_sdk_library: Add system-server scope" into rvc-dev am: 4754d4451c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11705588

Change-Id: I6c2a7000cf7b46dcef8ed476d6e96ffc7e441ed4
2020-06-10 13:12:51 +00:00
Paul Duffin
4754d4451c Merge "java_sdk_library: Add system-server scope" into rvc-dev 2020-06-10 13:01:31 +00:00
Roland Levillain
4f5297b438 Rename native code coverage paths product variables in Soong.
Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also rename function `android.CoverageEnabledForPath` as
`android.NativeCoverageEnabledForPath`.

Test: m nothing
Bug: 158212027
Change-Id: Id2c11a638e88088096420b537effa866d7667304
2020-06-10 13:00:07 +01:00
Victor Khimenko
690ccb2a4f [automerger skipped] Make it possible to specify separate rules for native_bridge case am: 78f654c6cf -s ours
am skip reason: Change-Id I60145bbb9c94318f14af3cabd9f5960fc9ee62de with SHA-1 c26fcf4947 is in history

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

Change-Id: If6f906185c5f349356aeb3831f87b43398a3ab46
2020-06-10 00:05:44 +00:00
Jiyong Park
46b4ebb187 [automerger skipped] Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68 am: ebccc4ddf5 -s ours
am skip reason: Change-Id I85570506e700be59ee63e4f1d7902a40e36df39c with SHA-1 afd3d11a79 is in history

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

Change-Id: Ib4b9675a095767ad2b117f644b9b8260defc8b0f
2020-06-09 23:39:20 +00:00
Jiyong Park
ebccc4ddf5 Merge "dex_import that isn't available for platform isn't installed" am: d4873a6b68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1325676

Change-Id: I1c70a39543d6edfef383464ae70e2d19518179b2
2020-06-09 23:21:45 +00:00
Jiyong Park
d4873a6b68 Merge "dex_import that isn't available for platform isn't installed" 2020-06-09 23:02:10 +00:00
Colin Cross
3cda0d8df9 Add DistForGoal to MakeVarsContext
Add methods to MakeVarsContext to allow Singletons to dist
artifacts without manually adding $(dist-for-goals) in Make.

Test: m checkbuild
Change-Id: Ia5ddb31afe29329f2df0ae1297ed963c8c28e590
2020-06-09 14:38:51 -07:00
Colin Cross
c3d87d3112 Define Soong phony rules in Make
To support dist-for-goals in Soong, we need to define all phony rules
in Make so that dist-for-goals can insert additional dependencies on
them.  Collect all the phony rules in phonySingleton and write them
out as Make rules when Soong is embedded in Make, or as blueprint.Phony
rules when Soong is run standalone.

Test: m checkbuild
Change-Id: I68201eff30744b0f487fc4f11f033767b53a627d
2020-06-09 14:38:50 -07:00
Colin Cross
2fce23ae6d Remove paths from cc.TestConfig
Now that tests don't need to specify every path passed to
PathForSource or PathForModuleSrc, remove them from cc.TestConfig.

Test: all soong tests
Change-Id: I90cd7b4dfc49c156afbb0eea9a77159c3e1860fa
2020-06-09 14:38:47 -07:00
Colin Cross
238c1f3903 Remove most paths from java.TestConfig
Now that tests don't need to specify every path passed to
PathForSource or PathForModuleSrc, remove most of them from
java.TestConfig.  Leave a few that are globbed by lots of tests,
and move a few that are globbed by a single test into the tests.

Test: all soong tests
Change-Id: Ica91d7203a6a7dbca0fd4fed84c78f149b8699e1
2020-06-09 14:38:39 -07:00
Victor Khimenko
78f654c6cf Make it possible to specify separate rules for native_bridge case
This change make it possible to specify separate rules for native-bridge
case and non-native-bridge case.

Bug: http://b/153609531

Test: build 4arch product

Change-Id: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
Merged-In: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
2020-06-09 23:35:37 +02:00
sophiez
b858c6d497 Add ndk api parser for ndk api coverage.
Test: m test_ndk_api_coverage_parser

Change-Id: I7be4f505757b1ca915de5e378952f8b104e1d362
2020-06-09 14:33:20 -07:00
Colin Cross
5e6a797982 Allow tests to bypass PathForSource existence checks
Forcing every test to specify every file it wants to pass to
PathForSource or PathForModuleSrc is painful to maintain and
doesn't add any value.  Allow tests to reference paths through
PathForSource and PathForModuleSrc without specifying them in
the mock FS.

Test: all soong tests
Change-Id: Ia8a8fd965a338d0645b3721314bf91f50146ad21
2020-06-09 14:23:11 -07:00
Chris Parsons
26cdf135ff When bpfix fails in androidmk, output the tree anyway
This can help with debugging cases where the resulting blueprint file is
invalid.

Test: Manual run of androidmk
Change-Id: I39605afa851aa6cdd8b49cc56386a8fc7347115c
2020-06-09 16:01:51 -04:00
Victor Khimenko
a7ce2945bd Merge "Make it possible to specify separate rules for native_bridge case" am: bf488e10e8 am: b9b5662e3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1306133

Change-Id: I86837a0a58d6c7e55715da551b7fd0c5e54df19e
2020-06-09 18:04:06 +00:00
Victor Khimenko
b9b5662e3f Merge "Make it possible to specify separate rules for native_bridge case" am: bf488e10e8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1306133

Change-Id: I0657cc1bf2bea1165ff1615ab1db34aa6a9d83b6
2020-06-09 17:52:37 +00:00
Victor Khimenko
bf488e10e8 Merge "Make it possible to specify separate rules for native_bridge case" 2020-06-09 17:41:28 +00:00
Ivan Lozano
c1e8528a00 Merge "Specify SONAME when building Rust shared libs." am: 4231e344fa am: 1d329be624
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326238

Change-Id: If9bfabe428428ce856769f4c4dfe5199ab29267d
2020-06-09 16:38:01 +00:00
Pete Gillin
811814282d Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b am: 5dbf9e09f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I731da4ed59432a67bdc3df124a8939bcf316aa0c
2020-06-09 16:37:21 +00:00
Ivan Lozano
1d329be624 Merge "Specify SONAME when building Rust shared libs." am: 4231e344fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326238

Change-Id: If4ad90a3e9fa781fe4daad3618a9d338b0aaf522
2020-06-09 16:00:27 +00:00
Ivan Lozano
4231e344fa Merge "Specify SONAME when building Rust shared libs." 2020-06-09 15:49:34 +00:00
Pete Gillin
5dbf9e09f2 Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I93e8a2a91f9a5bed9d3274ad937bb351edf4aa88
2020-06-09 13:28:54 +00:00
Pete Gillin
d7db79cc8b Merge "Split the core/platform API into stable and legacy versions." 2020-06-09 13:20:31 +00:00
Inseob Kim
96f17f0eed Choose SAbi files with module's vndk version
No matter what BOARD_VNDK_VERSION is set to, VNDKs should be regarded as
PLATFORM_VNDK_VERSION. This fixes an abidiff error due to the version
mismatch.

Bug: 157106227
Test: manual test with BOARD_VNDK_VERSION
Change-Id: I0d262b8ee5ac6f40fea7c2fb18322531434c0b4b
2020-06-09 22:05:09 +09:00
Ramy Medhat
578c91fe13 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." am: 4e372f7841 am: 9ec9b60463
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323176

Change-Id: Icb4ad192227710eef30455409f7b0d99e2c128e1
2020-06-09 12:46:56 +00:00
Ivan Lozano
bec05ea26d Specify SONAME when building Rust shared libs.
Without specifying -soname, cc binaries are unable to locate Rust
provided shared libraries. This adds the -soname linker flag for shared
libraries.

Bug: 158490355
Test: readelf -d <cc_binary> shows the expected SONAME
Change-Id: I66852a7ce24d5ea5e426f11bc1834fb56a150628
2020-06-09 08:40:24 -04:00
Ramy Medhat
9ec9b60463 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." am: 4e372f7841
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323176

Change-Id: I9549d3f9d482ea6b497fb5bb7d1cb0dcc878d46a
2020-06-09 12:32:17 +00:00
Ramy Medhat
4e372f7841 Merge "Turn on metalava sandbox warning in all droiddoc metalava invocations." 2020-06-09 12:17:38 +00:00
Victor Khimenko
c26fcf4947 Make it possible to specify separate rules for native_bridge case
This change make it possible to specify separate rules for native-bridge
case and non-native-bridge case.

Bug: http://b/153609531

Test: build 4arch product

Change-Id: I60145bbb9c94318f14af3cabd9f5960fc9ee62de
2020-06-09 13:31:37 +02:00
Treehugger Robot
bf8b66d136 [automerger skipped] Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df am: 15a013b87a -s ours
am skip reason: Change-Id I6175d7c59734ba9b6c32457e5a9b0704d49f4106 with SHA-1 92febdc85f is in history

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

Change-Id: I71301deba80c51da234ccad39d4d010030c0a04a
2020-06-09 10:28:07 +00:00
Treehugger Robot
15a013b87a Merge "Revert^2: "Remove implict jni.h include path"" am: 8b1531e7df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1326314

Change-Id: I45068a8fb9985d23da62da90b7d4304d71448664
2020-06-09 10:11:38 +00:00
Treehugger Robot
8b1531e7df Merge "Revert^2: "Remove implict jni.h include path"" 2020-06-09 09:55:13 +00:00
Orion Hodson
5cffce1207 Revert^2: "Remove implict jni.h include path"
Bug: 152482542
Test: m checkbuild

Change-Id: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Merged-In: I6175d7c59734ba9b6c32457e5a9b0704d49f4106
Exempt-From-Owner-Approval: approved in other branches
(cherry picked from commit e3ce0ba781)
2020-06-09 09:54:56 +00:00
Elliott Hughes
79ae341d4b Remove TARGET_PREFER_32_BIT support.
Bug: https://issuetracker.google.com/138812821
Test: builds
Change-Id: If96cccbd82ba1311165d61c947c928c6e7cd5593
2020-06-08 16:37:13 -07:00
Frank Feng
afcf52820b Merge "Implement test config auto-gen for sh_test." am: d90c6c42e4 am: 58894c86dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1323393

Change-Id: I2445722a4ac5f7ae6f3387261e35b5272ca951cb
2020-06-08 21:31:52 +00:00