diff options
| author | Ying Wang <wangying@google.com> | 2014-12-01 15:56:19 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-12-01 15:56:19 -0800 |
| commit | a11cf4d535bba34a15d0e8b43210c6c0f54d03ce (patch) | |
| tree | 3906594804c2147e70960718677bc28677222786 | |
| parent | 7dcbc563f8811259809b754d0c0edc717e1476e6 (diff) | |
| download | build-a11cf4d535bba34a15d0e8b43210c6c0f54d03ce.zip build-a11cf4d535bba34a15d0e8b43210c6c0f54d03ce.tar.gz build-a11cf4d535bba34a15d0e8b43210c6c0f54d03ce.tar.bz2 | |
Don't set up the prebuilt apk rule twice.
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.
Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
| -rw-r--r-- | core/prebuilt.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/prebuilt.mk b/core/prebuilt.mk index ba0e757..d3f9d1a 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -25,6 +25,10 @@ include $(BUILD_SYSTEM)/prebuilt_internal.mk ifneq ($(my_module_multilib),both) my_skip_non_preferred_arch := true endif # $(my_module_multilib) +# For apps, we don't want to set up the prebuilt apk rule twice even if "LOCAL_MULTILIB := both". +ifeq (APPS,$(LOCAL_MODULE_CLASS)) +my_skip_non_preferred_arch := true +endif endif # $(my_module_arch_supported) ifndef my_skip_non_preferred_arch |