Commit d7de2745 authored by Herve Jourdain's avatar Herve Jourdain Committed by Rick Bell

TERM must be set in the environment for gradle.

Otherwise, Android build fails complaining TERM is not set.

Change-Id: Ibf92b2eca73c71c249d313614ab0ae611ea4f524
Signed-off-by: default avatarHerve Jourdain <herve.jourdain@beechwoods.com>
parent e0ea4b7d
...@@ -43,6 +43,8 @@ Import('env') ...@@ -43,6 +43,8 @@ Import('env')
if os.environ.get('TERM') is not None: if os.environ.get('TERM') is not None:
env['ENV']['TERM'] = os.environ['TERM'] env['ENV']['TERM'] = os.environ['TERM']
else:
env['ENV']['TERM'] = 'xterm'
# Load extra options # Load extra options
SConscript('extra_options.scons') SConscript('extra_options.scons')
......
...@@ -235,7 +235,8 @@ jdk_env = None ...@@ -235,7 +235,8 @@ jdk_env = None
if target_os in ['android']: if target_os in ['android']:
# Gradle needs some settings in the environment: # Gradle needs some settings in the environment:
jdk_env = env.Clone(ENV={'JAVA_HOME':env['JAVA_HOME'], jdk_env = env.Clone(ENV={'JAVA_HOME':env['JAVA_HOME'],
'ANDROID_HOME':env['ANDROID_HOME']}) 'ANDROID_HOME':env['ANDROID_HOME'],
'TERM':env['ENV']['TERM']})
else: else:
jdk_env = env.Clone() jdk_env = env.Clone()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment