diff options
| author | Logan Chien <loganchien@google.com> | 2017-12-20 01:17:32 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-04-25 14:47:50 +0800 |
| commit | 43d34c38d845b49a1177eae296725c08a7c13f95 (patch) | |
| tree | ea15aedec9a8eae080efd3166a01cb75b41c2435 /android/androidmk.go | |
| parent | 95ba30aa5663f91251fecb83ff2d828763e2ce36 (diff) | |
| download | build_soong-43d34c38d845b49a1177eae296725c08a7c13f95.tar.gz build_soong-43d34c38d845b49a1177eae296725c08a7c13f95.tar.bz2 build_soong-43d34c38d845b49a1177eae296725c08a7c13f95.zip | |
Introduce runtime_libs to cc_binary and cc_library
This commit adds `runtime_libs` to cc_binary and cc_library.
Similar to the `required` property, if a module specifies the
`runtime_libs` properties and it is installed, then the modules
specified in `runtime_libs` will be installed as well.
Differnt from the `required` property, if a module is using VNDK and the
module names specified in `runtime_libs` are resolved to the modules
with both core and vendor variants, then '.vendor' will be appended to
those module names.
For example, if `libb` is vendor_available and `libd` is a vendor lib,
then LOCAL_REQUIRED_MODULES will contain `libb.vendor` (instead of
`libb`).
Bug: 72343507
Test: lunch aosp_arm64_ab-userdebug && make # this runs the unit tests
Test: Create a vendor module with runtime_libs property to a
vendor_available shared library and check the generated Android.mk.
Change-Id: I9e245d80004dab597a5d3db5acd8a09117118db7
Diffstat (limited to 'android/androidmk.go')
| -rw-r--r-- | android/androidmk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index a60520fb..a24d7bc2 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -169,7 +169,7 @@ func translateAndroidMkModule(ctx SingletonContext, w io.Writer, mod blueprint.M data.Include = "$(BUILD_PREBUILT)" } - data.Required = amod.commonProperties.Required + data.Required = append(data.Required, amod.commonProperties.Required...) // Make does not understand LinuxBionic if amod.Os() == LinuxBionic { |