diff options
| author | Ying Wang <wangying@google.com> | 2013-02-12 12:28:45 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-02-12 12:28:45 -0800 |
| commit | 90397c10298c26dc163b722d95cb3b0100a02379 (patch) | |
| tree | 06c110a66c53ac7a30bdfee1d7b8ff8e6a43e9c1 /core/prebuilt.mk | |
| parent | 6adffc196f694aafe02f13cbe48b701e034b5131 (diff) | |
| download | build-90397c10298c26dc163b722d95cb3b0100a02379.zip build-90397c10298c26dc163b722d95cb3b0100a02379.tar.gz build-90397c10298c26dc163b722d95cb3b0100a02379.tar.bz2 | |
Add deps on LOCAL_SHARED_LIBRARIES for prebuilts.
This is necessary for prebuilt build cache to work properly.
Change-Id: Ica28ce4d245a948142e067d82ff84ce1aef2134e
Diffstat (limited to 'core/prebuilt.mk')
| -rw-r--r-- | core/prebuilt.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index c9e07ef..46771e4 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -33,14 +33,15 @@ ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) OVERRIDE_BUILT_MODULE_PATH := $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES) endif -# Deal with the OSX library timestamp issue when installing -# a prebuilt simulator library. ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) prebuilt_module_is_a_library := true else prebuilt_module_is_a_library := endif +# Install the shared libraries if necessary +LOCAL_REQUIRED_MODULES += $(LOCAL_SHARED_LIBRARIES) + # Don't install static libraries by default. ifndef LOCAL_UNINSTALLABLE_MODULE ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)) |