Add android_sdk to third_party to be used by golem when benchmarking
Right now the runners cannot build the target because they are missing
the android sdk.
Change-Id: I5d8ba65e1b1090628957c7285dc26edb2bd69e67
diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 998c9ef..fef337a 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -185,7 +185,7 @@
cmd = [jdk.GetJavaExecutable(), '-ea', '-jar', r8_jar, 'extractmarker', apk]
elif os.path.isfile(r8lib_jar):
cmd = [jdk.GetJavaExecutable(), '-ea', '-cp', r8lib_jar,
- 'com.android.tools.r8.SwissArmyKnife', 'extractmarker', apk]
+ 'com.android.tools.r8.ExtractMarker', apk]
else:
script = os.path.join(utils.TOOLS_DIR, 'extractmarker.py')
cmd = ['python', script, apk]
@@ -452,7 +452,7 @@
app, config, checkout_dir, proguard_config_dest)
env = {}
- env['ANDROID_HOME'] = utils.ANDROID_HOME
+ env['ANDROID_HOME'] = utils.getAndroidHome()
env['JAVA_OPTS'] = '-ea:com.android.tools.r8...'
releaseTarget = config.get('releaseTarget')
@@ -774,6 +774,9 @@
if os.path.exists(WORKING_DIR):
shutil.rmtree(WORKING_DIR)
shutil.copytree(utils.OPENSOURCE_APPS_FOLDER, WORKING_DIR)
+ os.environ[utils.ANDROID_HOME_ENVIROMENT_NAME] = os.path.join(
+ utils.ANDROID_SDK)
+ os.environ[utils.ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME] = '28.0.3'
if not os.path.exists(WORKING_DIR):
os.makedirs(WORKING_DIR)
