commit 7fff9a1a560b822be79f47566f43b76111d7aecf
author Ying Wang <wangying@google.com> Thu Jan 09 14:39:41 2014 -0800
committer Ying Wang <wangying@google.com> Thu Jan 09 14:39:41 2014 -0800
tree 0138b86c56d48a497e7b549d28aa5595f26de647
parent aed499879210c7432c1c5b3869f383b27b17dafc

Define PRIVATE_TARGET_ variables for only target modules.

Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index cfa9923..c677dea 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -150,6 +150,7 @@
 ###########################################################
 ## Define PRIVATE_ variables from global vars
 ###########################################################
+ifndef LOCAL_IS_HOST_MODULE
 ifdef LOCAL_SDK_VERSION
 my_target_project_includes :=
 my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include
@@ -175,7 +176,8 @@
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags)
 
-ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)
+else # LOCAL_IS_HOST_MODULE
+
 ifeq ($(LOCAL_CLANG),true)
 my_host_global_cflags := $(CLANG_HOST_GLOBAL_CFLAGS)
 my_host_global_cppflags := $(CLANG_HOST_GLOBAL_CPPFLAGS)