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

Unify command for creation of llndk, vndk abi references.

Browse Source 
Bug: 64267858

Test: utils/create_reference_dumps.py creates llndk + vndk abi
      references

Test: utils/create_reference_dumps.py -l libjpeg

Change-Id: I72ae13fb9c48f23a62b959195dbd5fa6fe4c14b0
This commit is contained in:
Jayant Chowdhary
2018-04-11 14:17:54 -07:00
parent 1c3364c022
commit a038b56c7d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/utils/create_reference_dumps.py
View File

@@ -14,7 +14,6 @@ from utils import (make_libraries, make_tree, find_lib_lsdumps,
make_targets) make_targets)
PRODUCTS = ['aosp_arm_ab', 'aosp_arm64_ab', 'aosp_x86_ab', 'aosp_x86_64_ab'] PRODUCTS = ['aosp_arm_ab', 'aosp_arm64_ab', 'aosp_x86_ab', 'aosp_x86_64_ab']
FIND_LSDUMPS_TARGET = 'findlsdumps'
SOONG_DIR = os.path.join(AOSP_DIR, 'out', 'soong', '.intermediates') SOONG_DIR = os.path.join(AOSP_DIR, 'out', 'soong', '.intermediates')
class Target(object): class Target(object):
@@ -41,8 +40,7 @@ def get_lsdump_paths_from_out(product):
lsdump_paths_file = os.path.join(AOSP_DIR, build_vars[0],'target', lsdump_paths_file = os.path.join(AOSP_DIR, build_vars[0],'target',
'product', build_vars[1], 'product', build_vars[1],
'lsdump_paths.txt') 'lsdump_paths.txt')
if os.path.exists(lsdump_paths_file) == False: assert(os.path.exists(lsdump_paths_file) == True)
make_targets([FIND_LSDUMPS_TARGET], product)
lsdump_paths = dict() lsdump_paths = dict()
with open(lsdump_paths_file) as f: with open(lsdump_paths_file) as f:
for path in f.read().split(' '): for path in f.read().split(' '):

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

@@ -125,7 +125,7 @@ def run_header_abi_linker(output_path, inputs, version_script, api, arch):
def make_tree(product): def make_tree(product):
# To aid creation of reference dumps. # To aid creation of reference dumps.
make_cmd = ['build/soong/soong_ui.bash', '--make-mode', '-j', make_cmd = ['build/soong/soong_ui.bash', '--make-mode', '-j',
'vndk', 'TARGET_PRODUCT=' + product] 'vndk', 'findlsdumps', 'TARGET_PRODUCT=' + product]
subprocess.check_call(make_cmd, cwd=AOSP_DIR) subprocess.check_call(make_cmd, cwd=AOSP_DIR)
def make_targets(targets, product): def make_targets(targets, product):