tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d19496b1: am 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."

Browse source 
* commit 'd19496b134ff56167266566920acf93867b8972d':
  Define PRIVATE_TARGET_ variables for only target modules.
This commit is contained in:
Ying Wang 2014-01-10 01:54:28 +00:00 committed by Android Git Automerger
commit 15cfc9170b
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/binary.mk
View file

@ -150,6 +150,7 @@ LOCAL_ASFLAGS += -D__ASSEMBLY__
########################################################### ###########################################################
## Define PRIVATE_ variables from global vars ## Define PRIVATE_ variables from global vars
########################################################### ###########################################################
ifndef LOCAL_IS_HOST_MODULE
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
my_target_project_includes := my_target_project_includes :=
my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include 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_CFLAGS := $(my_target_globa
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) $(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) ifeq ($(LOCAL_CLANG),true)
my_host_global_cflags := $(CLANG_HOST_GLOBAL_CFLAGS) my_host_global_cflags := $(CLANG_HOST_GLOBAL_CFLAGS)
my_host_global_cppflags := $(CLANG_HOST_GLOBAL_CPPFLAGS) my_host_global_cppflags := $(CLANG_HOST_GLOBAL_CPPFLAGS)