openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" 

* commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc':
  Add an explicit definition of __ANDROID__=1
This commit is contained in:
Ben Cheng 2013-12-12 13:57:55 -08:00 committed by Android Git Automerger
parent 4d74482911 2609640eae
commit af3d1408be
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/combo/TARGET_linux-aarch64.mk
View File

@ -75,12 +75,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
android_config_h := $(call select-android-config-h,linux-aarch64)
TARGET_GLOBAL_CFLAGS += \
-fpic -fPIE \
$(arch_variant_cflags) \
-include $(android_config_h) \
-I $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += \
-fpic -fPIE \
-ffunction-sections \
@ -94,6 +88,9 @@ TARGET_GLOBAL_CFLAGS += \
-include $(android_config_h) \
-I $(dir $(android_config_h))
# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh
TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1
TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields
# This is to avoid the dreaded warning compiler message: