Switch to new soong_ui dumpvar-mode

Stop using make directly.

Test: manual tests
Test: development/scripts/symbol.py
Change-Id: I9f75776251b693dbe979989942d2db49768224d2

2 files changed, 3 insertions, 11 deletions

diff --git a/scripts/symbol.py b/scripts/symbol.py
index 7531b7d27..77ee1b33d 100755
--- a/scripts/symbol.py
+++ b/scripts/symbol.py
@@ -36,9 +36,7 @@ def FindSymbolsDir():
   saveddir = os.getcwd()
   os.chdir(ANDROID_BUILD_TOP)
   try:
-    cmd = ("CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core "
-           "SRC_TARGET_DIR=build/target make -f build/core/config.mk "
-           "dumpvar-abs-TARGET_OUT_UNSTRIPPED")
+    cmd = "build/soong/soong_ui.bash --dumpvar-mode --abs TARGET_OUT_UNSTRIPPED"
     stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).stdout
     return os.path.join(ANDROID_BUILD_TOP, stream.read().strip())
   finally:
diff --git a/vndk/tools/header-checker/utils/utils.py b/vndk/tools/header-checker/utils/utils.py
index a387974f0..fd4141325 100644
--- a/vndk/tools/header-checker/utils/utils.py
+++ b/vndk/tools/header-checker/utils/utils.py
@@ -152,15 +152,9 @@ def get_build_var(name):
     if 'ANDROID_PRODUCT_OUT' not in os.environ:
         return None
 
-    cmd = ['make', '--no-print-directory', '-f', 'build/core/config.mk',
-           'dumpvar-' + name]
-
-    environ = dict(os.environ)
-    environ['CALLED_FROM_SETUP'] = 'true'
-    environ['BUILD_SYSTEM'] = 'build/core'
+    cmd = ['build/soong/soong_ui.bash', '--dumpvar-mode', name]
 
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                            stderr=subprocess.PIPE, env=environ,
-                            cwd=AOSP_DIR)
+                            stderr=subprocess.PIPE, cwd=AOSP_DIR)
     out, err = proc.communicate()
     return out.decode('utf-8').strip()