Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11cf4d5 authored by Ying Wang's avatar Ying Wang
Browse files

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
parent 7dcbc563

core/prebuilt.mk

+4 −0
Original line number Diff line number Diff line
@@ -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