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

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

am 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables... 

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

* commit '02e4bb6b':
  Define PRIVATE_TARGET_ variables for only target modules.
parents 948786c9 02e4bb6b

core/binary.mk

+3 −1
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ LOCAL_ASFLAGS += -D__ASSEMBLY__ 
###########################################################

## 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_CFLAGS := $(my_target_globa 
$(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)