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

Commit 2752e7d3 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 1d722cdb: am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."

* commit '1d722cdb':
  Don't set up the prebuilt apk rule twice.
parents 7fcb9209 1d722cdb
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,10 @@ include $(BUILD_SYSTEM)/prebuilt_internal.mk
ifneq ($(my_module_multilib),both)
ifneq ($(my_module_multilib),both)
my_skip_non_preferred_arch := true
my_skip_non_preferred_arch := true
endif # $(my_module_multilib)
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)
endif # $(my_module_arch_supported)


ifndef my_skip_non_preferred_arch
ifndef my_skip_non_preferred_arch