diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-02 07:23:41 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-02 07:23:41 +0200 |
| commit | e57bca90ab9e5c7ab983d2db62b033dd2f00f653 (patch) | |
| tree | 50b0cc9c7593eb242e71f623a16da3fe95b1e904 | |
| parent | cc0a7b24e760512c4a17e54371c3308cd082c266 (diff) | |
| parent | 408c26ce0bc3847ed956a6993faa2619cd942da2 (diff) | |
Merge pull request #4982 from vnen/pr-android-flags
Remove Make-related flags from Android build
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | platform/android/detect.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index ef17e13534..e1941b18df 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ tools/editor/certs_compressed.h tools/editor/editor_icons.cpp tools/editor/translations.h tools/editor/builtin_fonts.h --fpic .fscache make.bat log.txt @@ -33,6 +32,7 @@ doc/_build/ *.bc # Android specific +platform/android/java/build.gradle platform/android/java/.gradle platform/android/java/.gradletasknamecache platform/android/java/local.properties diff --git a/platform/android/detect.py b/platform/android/detect.py index 11b14eb989..ba6b73a89f 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -168,11 +168,11 @@ def configure(env): env['neon_enabled']=False if env['android_arch']=='x86': - env['CCFLAGS'] = string.split('-DNO_STATVFS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__ -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__GLIBC__ -Wno-psabi -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') elif env["android_arch"]=="armv6": - env['CCFLAGS'] = string.split('-DNO_STATVFS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__ -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_6__ -D__GLIBC__ -Wno-psabi -march=armv6 -mfpu=vfp -mfloat-abi=softfp -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') elif env["android_arch"]=="armv7": - env['CCFLAGS'] = string.split('-DNO_STATVFS -MMD -MP -MF -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__ -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') + env['CCFLAGS'] = string.split('-DNO_STATVFS -fpic -ffunction-sections -funwind-tables -fstack-protector -fvisibility=hidden -D__ARM_ARCH_7__ -D__ARM_ARCH_7A__ -D__GLIBC__ -Wno-psabi -march=armv7-a -mfloat-abi=softfp -ftree-vectorize -funsafe-math-optimizations -fno-strict-aliasing -DANDROID -Wa,--noexecstack -DGLES2_ENABLED') if env['android_neon']=='yes': env['neon_enabled']=True env.Append(CCFLAGS=['-mfpu=neon','-D__ARM_NEON__']) |