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

Merge "Split gen_bp_files, make Android.bp idempotent." am: 8d6aeab882 am: d0edac4eea

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1450076

Change-Id: I8caff0db72733435bf12ac06d201729c3e2f2642
This commit is contained in:
Bill Peckham
2020-10-07 14:16:39 +00:00
committed by Automerger Merge Worker
parent b15ece0561 d0edac4eea
commit ae197196ca
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vendor_snapshot/update.py
View File

@@ -208,7 +208,7 @@ def gen_bp_module(variation, name, version, target_arch, arch_props, bp_dir):
return bp
def gen_bp_files(install_dir, snapshot_version):
def build_props(install_dir):
# props[target_arch]["static"|"shared"|"binary"|"header"][name][arch] : json
props = dict()
@@ -264,11 +264,17 @@ def gen_bp_files(install_dir, snapshot_version):
else:
variation_dict[module_name][arch].update(prop)
for target_arch in props:
return props
def gen_bp_files(install_dir, snapshot_version):
props = build_props(install_dir)
for target_arch in sorted(props):
androidbp = ''
bp_dir = os.path.join(install_dir, target_arch)
for variation in props[target_arch]:
for name in props[target_arch][variation]:
for variation in sorted(props[target_arch]):
for name in sorted(props[target_arch][variation]):
androidbp += gen_bp_module(variation, name, snapshot_version,
target_arch,
props[target_arch][variation][name],