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

am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"

Browse source 
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
This commit is contained in:
Colin Cross 2014-01-28 02:31:18 +00:00 committed by Android Git Automerger
commit 0d24616dd1
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/binary.mk
View file

@ -97,6 +97,7 @@ my_cxx := $(LOCAL_CXX)
my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
my_generated_sources := $(LOCAL_GENERATED_SOURCES)
my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags))
# The real dependency will be added after all Android.mks are loaded and the install paths
# of the shared libraries are determined.

3
core/combo/TARGET_linux-arm64.mk
View file

@ -91,6 +91,9 @@ TARGET_GLOBAL_CFLAGS += \
-include $(android_config_h) \
-I $(dir $(android_config_h))
# HACK: globally disable -fstack-protector until the toolchain supports it
TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector
# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh
TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1