summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-10 19:41:15 (GMT)
committerAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-10 19:41:15 (GMT)
commitc09784e114444c607aa10ddb4950bd27d988423f (patch)
treef4a51a198e87f3480095f9baa1f67c28869b057c
parentd6893a6a2a859674ce459096b61bef050c816fd9 (diff)
downloadcerbero-c09784e114444c607aa10ddb4950bd27d988423f.tar.gz
cerbero-c09784e114444c607aa10ddb4950bd27d988423f.tar.xz
android: don't override the config arch
-rw-r--r--config/android.config6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/android.config b/config/android.config
index 3b9bf36..58f8067 100644
--- a/config/android.config
+++ b/config/android.config
@@ -15,7 +15,7 @@ toolchain_path = None
if target_arch == Architecture.ARM or target_arch == Architecture.ARMv7:
tools_prefix = 'arm-linux-androideabi'
- arch = 'arm'
+ _arch = 'arm'
for tc_version in ['4.8', '4.7', '4.6']:
for tc_arch in ['linux-x86', 'linux-x86_64']:
@@ -27,7 +27,7 @@ if target_arch == Architecture.ARM or target_arch == Architecture.ARMv7:
break
elif target_arch == Architecture.X86:
tools_prefix = 'i686-linux-android'
- arch = 'x86'
+ _arch = 'x86'
for tc_version in ['4.8', '4.7', '4.6']:
for tc_arch in ['linux-x86', 'linux-x86_64']:
tmp = '%s/toolchains/x86-%s/prebuilt/%s/bin' % (toolchain_prefix, tc_version, tc_arch)
@@ -51,7 +51,7 @@ elif target_distro_version == DistroVersion.ANDROID_JELLY_BEAN:
else:
raise FatalError("DistroVersion not supported")
-sysroot = "%s/platforms/android-%s/arch-%s" % (toolchain_prefix, v, arch)
+sysroot = "%s/platforms/android-%s/arch-%s" % (toolchain_prefix, v, _arch)
# Default compiler flags
os.environ['CFLAGS'] = '-Wall -g -Os '