LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to new soong_ui dumpvar-mode

Browse Source 
Stop using make directly.

Test: manual tests
Test: development/scripts/symbol.py
Change-Id: I9f75776251b693dbe979989942d2db49768224d2
This commit is contained in:
Dan Willemsen
2017-10-17 14:04:56 -07:00
parent c1c3e5f1d8
commit d3fc8faff6
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/symbol.py
View File

@@ -36,9 +36,7 @@ def FindSymbolsDir():
saveddir = os.getcwd() saveddir = os.getcwd()
os.chdir(ANDROID_BUILD_TOP) os.chdir(ANDROID_BUILD_TOP)
try: try:
cmd = ("CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core " cmd = "build/soong/soong_ui.bash --dumpvar-mode --abs TARGET_OUT_UNSTRIPPED"
"SRC_TARGET_DIR=build/target make -f build/core/config.mk "
"dumpvar-abs-TARGET_OUT_UNSTRIPPED")
stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).stdout stream = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True).stdout
return os.path.join(ANDROID_BUILD_TOP, stream.read().strip()) return os.path.join(ANDROID_BUILD_TOP, stream.read().strip())
finally: finally:

10
vndk/tools/header-checker/utils/utils.py
View File

@@ -152,15 +152,9 @@ def get_build_var(name):
if 'ANDROID_PRODUCT_OUT' not in os.environ: if 'ANDROID_PRODUCT_OUT' not in os.environ:
return None return None
cmd = ['make', '--no-print-directory', '-f', 'build/core/config.mk', cmd = ['build/soong/soong_ui.bash', '--dumpvar-mode', name]
'dumpvar-' + name]
environ = dict(os.environ)
environ['CALLED_FROM_SETUP'] = 'true'
environ['BUILD_SYSTEM'] = 'build/core'
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=environ, stderr=subprocess.PIPE, cwd=AOSP_DIR)
cwd=AOSP_DIR)
out, err = proc.communicate() out, err = proc.communicate()
return out.decode('utf-8').strip() return out.decode('utf-8').strip()