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

Merge "Use binder bitness instead of primary arch for references root."

Browse Source 
am: 165477b817

Change-Id: I974eaa0b43ae86d2f37c23d2371afbbb918c2de3
This commit is contained in:
Jayant Chowdhary
2018-03-09 03:18:02 +00:00
committed by android-build-merger
parent 3e8f0ec428 165477b817
commit 6283223860
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,11 +69,12 @@ def get_ref_dump_dir_stem(args, vndk_or_ndk, product, platform_vndk_version):
version = platform_vndk_version version = platform_vndk_version
if version != '' and version[0].isdigit() == False : if version != '' and version[0].isdigit() == False :
version = 'current' version = 'current'
primary_arch =\ binder_bitness = '64'
get_build_vars_for_product(['TARGET_ARCH'], product)[0] if get_build_vars_for_product(['BINDER32BIT'], product)[0] == 'true':
binder_bitness = '32'
ref_dump_dir_stem = os.path.join(args.ref_dump_dir, vndk_or_ndk) ref_dump_dir_stem = os.path.join(args.ref_dump_dir, vndk_or_ndk)
ref_dump_dir_stem = os.path.join(ref_dump_dir_stem, version) ref_dump_dir_stem = os.path.join(ref_dump_dir_stem, version)
ref_dump_dir_stem = os.path.join(ref_dump_dir_stem, primary_arch) ref_dump_dir_stem = os.path.join(ref_dump_dir_stem, binder_bitness)
return ref_dump_dir_stem return ref_dump_dir_stem
@@ -94,8 +95,8 @@ def find_and_remove_path(root_path, file_name=None):
' -exec rm -rf {} \;' ' -exec rm -rf {} \;'
subprocess.check_call(remove_cmd_str, cwd=AOSP_DIR, shell=True) subprocess.check_call(remove_cmd_str, cwd=AOSP_DIR, shell=True)
else: else:
remove_cmd_str = 'rm -rf ' + root_path remove_cmd_str = 'rm -rf *'
subprocess.check_call(remove_cmd_str, cwd=AOSP_DIR, shell=True) subprocess.check_call(remove_cmd_str, cwd=root_path, shell=True)
def remove_references_for_all_arches_and_variants(args): def remove_references_for_all_arches_and_variants(args):
print('Removing reference dumps...') print('Removing reference dumps...')