summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-10-18 22:59:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-18 22:59:54 +0000
commit0c02ff56cc9bf119892337809e83968494f10b31 (patch)
treed3ade073413243fde2c57193c5998644acc8974c
parent0cc700b76347de0405778d5ae0e3e78e3dee3c90 (diff)
parentb020453ba3ff25bfdefe82b704356203ec699b9e (diff)
downloadvndk-0c02ff56cc9bf119892337809e83968494f10b31.tar.gz
Use soong_ui instead of make&config.mk am: db2f561cf5 am: ca3a8ac11c
am: b020453ba3 Change-Id: I3260e90cce054bd803f7f40af69c99d5d910ea33
-rwxr-xr-xgolden/dump_abi.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/golden/dump_abi.py b/golden/dump_abi.py
index 65ea0c8..a6fb4bf 100755
--- a/golden/dump_abi.py
+++ b/golden/dump_abi.py
@@ -91,14 +91,8 @@ def GetBuildVariable(build_top_dir, var):
Returns:
A string which is the value of the variable.
"""
- build_core = os.path.join(build_top_dir, "build", "core")
- env = dict(os.environ)
- env["CALLED_FROM_SETUP"] = "true"
- env["BUILD_SYSTEM"] = build_core
- cmd = ["make", "--no-print-directory",
- "-f", os.path.join(build_core, "config.mk"),
- "dumpvar-" + var]
- return _ExecuteCommand(cmd, env=env, cwd=build_top_dir)
+ cmd = ["build/soong/soong_ui.bash", "--dumpvar-mode", var]
+ return _ExecuteCommand(cmd, cwd=build_top_dir)
def FindBinary(file_name):