From ed635cfc0d77de471152f59fad99d4b8898a0f37 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Fri, 4 Sep 2015 15:08:08 -0700 Subject: [PATCH] Fix LOCAL_MODULE_HOST_OS Make sure LOCAL_IS_HOST_MODULE is set before including module_arch_supported.mk Bug: 23566667 Change-Id: I28ef10f093407eb3a6a83574ecc3f098eb775241 --- core/host_executable.mk | 2 +- core/host_executable_internal.mk | 1 - core/host_shared_library.mk | 1 + core/host_shared_library_internal.mk | 2 -- core/host_static_library.mk | 1 + core/host_static_library_internal.mk | 2 -- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/host_executable.mk b/core/host_executable.mk index 0091f3f73..5601b015e 100644 --- a/core/host_executable.mk +++ b/core/host_executable.mk @@ -1,4 +1,4 @@ - +LOCAL_IS_HOST_MODULE := true my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk diff --git a/core/host_executable_internal.mk b/core/host_executable_internal.mk index 0c0ac3d91..c59f15122 100644 --- a/core/host_executable_internal.mk +++ b/core/host_executable_internal.mk @@ -5,7 +5,6 @@ ## None. ########################################################### -LOCAL_IS_HOST_MODULE := true ifeq ($(strip $(LOCAL_MODULE_CLASS)),) LOCAL_MODULE_CLASS := EXECUTABLES endif diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index e84078013..6964cc950 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -1,3 +1,4 @@ +LOCAL_IS_HOST_MODULE := true my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk diff --git a/core/host_shared_library_internal.mk b/core/host_shared_library_internal.mk index 645098a60..9da778ae6 100644 --- a/core/host_shared_library_internal.mk +++ b/core/host_shared_library_internal.mk @@ -7,8 +7,6 @@ ## LOCAL_MODULE_SUFFIX will be set for you. ########################################################### -LOCAL_IS_HOST_MODULE := true - ifeq ($(strip $(LOCAL_MODULE_CLASS)),) LOCAL_MODULE_CLASS := SHARED_LIBRARIES endif diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 52c42ef93..dd7462d85 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -1,3 +1,4 @@ +LOCAL_IS_HOST_MODULE := true my_prefix := HOST_ include $(BUILD_SYSTEM)/multilib.mk diff --git a/core/host_static_library_internal.mk b/core/host_static_library_internal.mk index a533cf5dd..3946aa7bc 100644 --- a/core/host_static_library_internal.mk +++ b/core/host_static_library_internal.mk @@ -18,8 +18,6 @@ $(error $(LOCAL_PATH): Cannot set module stem for a library) endif LOCAL_UNINSTALLABLE_MODULE := true -LOCAL_IS_HOST_MODULE := true - include $(BUILD_SYSTEM)/binary.mk $(LOCAL_BUILT_MODULE): $(built_whole_libraries)