diff options
| author | 2015-09-05 01:25:16 +0000 | |
|---|---|---|
| committer | 2015-09-05 01:25:16 +0000 | |
| commit | 762746705c7414985dbd457481dd33d4c69adcbb (patch) | |
| tree | cf0cc40f4d59b5707672c4e18c6089880202ff5b | |
| parent | af72e1b3e68f449c81054bc25e655016529914e1 (diff) | |
| parent | ed635cfc0d77de471152f59fad99d4b8898a0f37 (diff) | |
Merge "Fix LOCAL_MODULE_HOST_OS"
| -rw-r--r-- | core/host_executable.mk | 2 | ||||
| -rw-r--r-- | core/host_executable_internal.mk | 1 | ||||
| -rw-r--r-- | core/host_shared_library.mk | 1 | ||||
| -rw-r--r-- | core/host_shared_library_internal.mk | 2 | ||||
| -rw-r--r-- | core/host_static_library.mk | 1 | ||||
| -rw-r--r-- | 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 0091f3f734..5601b015eb 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 0c0ac3d910..c59f15122f 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 e84078013e..6964cc950e 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 645098a60a..9da778ae6f 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 52c42ef931..dd7462d85d 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 a533cf5ddf..3946aa7bc9 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) |