diff options
| author | Ying Wang <wangying@google.com> | 2014-12-02 17:45:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 17:45:44 +0000 |
| commit | 1d722cdb36e08cf488e4047045189106b93c1f0e (patch) | |
| tree | 425cf60e67d5d18e0e0d6953616efc89b420d8bf /core | |
| parent | b2eaef295633a3be2809c8040215f266e42d3a15 (diff) | |
| parent | ded6640d970d83cb18ce2585565c11799064f5e0 (diff) | |
| download | build-1d722cdb36e08cf488e4047045189106b93c1f0e.zip build-1d722cdb36e08cf488e4047045189106b93c1f0e.tar.gz build-1d722cdb36e08cf488e4047045189106b93c1f0e.tar.bz2 | |
am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
* commit 'ded6640d970d83cb18ce2585565c11799064f5e0':
Don't set up the prebuilt apk rule twice.
Diffstat (limited to 'core')
| -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 |