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

finalize_sdk.py: copy jar stub files files

Browse Source 
Update finalize_sdk.py to extract the jar stub files from a build,
similarly to how it already extracts diff text files.

Also remove the '-stubs' part from the jar filenames.

Bug: 235578272
Test: manual: run finalize_sdk.py and inspect prebuilts/sdk/extensions
Change-Id: I4a67f2c06dd11c9ea91cf6eaf10035c729d55a32
This commit is contained in:
Mårten Kongstad
2022-09-22 14:38:26 +02:00
parent a52a66e03f
commit b9868b1a58
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/finalize_sdk.py
View File

@@ -76,20 +76,20 @@ def dir_for_sdk(filename, version):
return os.path.join(base, 'host-exports') return os.path.join(base, 'host-exports')
return base return base
def is_txt_ignored(txt_file): def is_ignored(file):
# Conscrypt has some legacy API tracking files that we don't consider for extensions. # Conscrypt has some legacy API tracking files that we don't consider for extensions.
bad_stem_prefixes = ['conscrypt.module.intra.core.api', 'conscrypt.module.platform.api'] bad_stem_prefixes = ['conscrypt.module.intra.core.api', 'conscrypt.module.platform.api']
return any([txt_file.stem.startswith(p) for p in bad_stem_prefixes]) return any([file.stem.startswith(p) for p in bad_stem_prefixes])
def maybe_tweak_compat_txt_stem(txt_file): def maybe_tweak_compat_stem(file):
# For legacy reasons, art and conscrypt txt file names in the SDKs (*.module.public.api) # For legacy reasons, art and conscrypt txt file names in the SDKs (*.module.public.api)
# do not match their expected filename in prebuilts/sdk (art, conscrypt). So rename them # do not match their expected filename in prebuilts/sdk (art, conscrypt). So rename them
# to match. # to match.
new_stem = txt_file.stem new_stem = file.stem
new_stem = new_stem.replace('art.module.public.api', 'art') new_stem = new_stem.replace('art.module.public.api', 'art')
new_stem = new_stem.replace('conscrypt.module.public.api', 'conscrypt') new_stem = new_stem.replace('conscrypt.module.public.api', 'conscrypt')
return txt_file.with_stem(new_stem) return file.with_stem(new_stem)
if not os.path.isdir('build/soong'): if not os.path.isdir('build/soong'):
fail("This script must be run from the top of an Android source tree.") fail("This script must be run from the top of an Android source tree.")
@@ -134,15 +134,15 @@ for m in module_names:
created_dirs[repo].add(dir) created_dirs[repo].add(dir)
# Copy api txt files to compat tracking dir # Copy api txt files to compat tracking dir
txt_files = [Path(p) for p in glob.glob(os.path.join(target_dir, 'sdk_library/*/*.txt'))] src_files = [Path(p) for p in glob.glob(os.path.join(target_dir, 'sdk_library/*/*.txt')) + glob.glob(os.path.join(target_dir, 'sdk_library/*/*.jar'))]
for txt_file in txt_files: for src_file in src_files:
if is_txt_ignored(txt_file): if is_ignored(src_file):
continue continue
api_type = txt_file.parts[-2] api_type = src_file.parts[-2]
dest_dir = compat_dir.joinpath(api_type, 'api') dest_dir = compat_dir.joinpath(api_type, 'api') if src_file.suffix == '.txt' else compat_dir.joinpath(api_type)
dest_file = maybe_tweak_compat_txt_stem(dest_dir.joinpath(txt_file.name)) dest_file = maybe_tweak_compat_stem(dest_dir.joinpath(src_file.name))
os.makedirs(dest_dir, exist_ok = True) os.makedirs(dest_dir, exist_ok = True)
shutil.copy(txt_file, dest_file) shutil.copy(src_file, dest_file)
created_dirs[COMPAT_REPO].add(dest_dir.relative_to(COMPAT_REPO)) created_dirs[COMPAT_REPO].add(dest_dir.relative_to(COMPAT_REPO))
subprocess.check_output(['repo', 'start', branch_name] + list(created_dirs.keys())) subprocess.check_output(['repo', 'start', branch_name] + list(created_dirs.keys()))