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

Commit f2777de6 authored Jan 27, 2014 by Ying Wang Committed by Android Git Automerger Jan 27, 2014

am 18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."

* commit '18294fbf':
  Support arch-specific LOCAL_C_INCLUDES.

parents 4a1f42d7 18294fbf

core/binary.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ my_ldflags := $(LOCAL_LDFLAGS) $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PRE
		my_asflags := $(LOCAL_ASFLAGS) $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
		my_cc := $(LOCAL_CC)
		my_cxx := $(LOCAL_CXX)
		my_c_includes := $(LOCAL_C_INCLUDES)
		my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
		my_generated_sources := $(LOCAL_GENERATED_SOURCES)

core/clear_vars.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -148,12 +148,14 @@ LOCAL_NO_2ND_ARCH:= # '',true
		# arch specific variables
		LOCAL_SRC_FILES_$(TARGET_ARCH):=
		LOCAL_CFLAGS_$(TARGET_ARCH):=
		LOCAL_C_INCLUDES_$(TARGET_ARCH):=
		LOCAL_ASFLAGS_$(TARGET_ARCH):=
		LOCAL_NO_CRT_$(TARGET_ARCH):=
		LOCAL_LDFLAGS_$(TARGET_ARCH):=
		ifdef TARGET_2ND_ARCH
		LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=
		LOCAL_CFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):=
		LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):=
		LOCAL_NO_CRT_$(TARGET_2ND_ARCH):=
		LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):=