From e4dc3c6727a83caf6f1827a302d9a399fa742316 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Tue, 13 Jul 2021 14:36:13 -0700
Subject: [PATCH] Set ANDROID_HOME in run_gradle.py (#27371)

---
 testing/scenario_app/android/run_gradle.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/testing/scenario_app/android/run_gradle.py b/testing/scenario_app/android/run_gradle.py
index b32ce5b1a5..2163c54670 100644
--- a/testing/scenario_app/android/run_gradle.py
+++ b/testing/scenario_app/android/run_gradle.py
@@ -11,13 +11,21 @@ import os
 import sys
 import subprocess
 
+SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
+ANDROID_HOME = os.path.join(SCRIPT_PATH, '..', '..', '..', '..', 'third_party',
+    'android_tools', 'sdk')
+
 def main():
+  if not os.path.isdir(ANDROID_HOME):
+    raise Exception('%s (ANDROID_HOME) is not a directory' % ANDROID_HOME)
+
   BAT = '.bat' if sys.platform.startswith(('cygwin', 'win')) else ''
   android_dir = os.path.abspath(os.path.dirname(__file__))
   gradle_bin = os.path.join('.', 'gradlew%s' % BAT)
   result = subprocess.check_output(
     args=[gradle_bin] + sys.argv[1:],
     cwd=android_dir,
+    env=dict(os.environ, ANDROID_HOME=ANDROID_HOME),
   )
   return 0
 
-- 
GitLab