diff options
| author | Ben Cheng <bccheng@google.com> | 2013-12-12 13:07:05 -0800 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-12-12 13:08:55 -0800 |
| commit | cd7b02d911a576760570d278336b1e1b49468303 (patch) | |
| tree | a280d8a0c8d95aaee91f69054819f4ef6a4687fa /core | |
| parent | d270230fa49311901d8797a9e77865c37857d028 (diff) | |
| download | build-cd7b02d911a576760570d278336b1e1b49468303.zip build-cd7b02d911a576760570d278336b1e1b49468303.tar.gz build-cd7b02d911a576760570d278336b1e1b49468303.tar.bz2 | |
Add an explicit definition of __ANDROID__=1
Once the aarch64 toolchain is refreshed this will be removed.
Also removed some CFLAG duplications.
Change-Id: I42fd86931263af82042ea696196fb25e948fe9cb
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-aarch64.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk index bdb3017..1b24435 100644 --- a/core/combo/TARGET_linux-aarch64.mk +++ b/core/combo/TARGET_linux-aarch64.mk @@ -77,12 +77,6 @@ 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 \ -fdata-sections \ -funwind-tables \ @@ -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: |