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

Merge "Use vndk.private: true for VNDK-private libs"

Browse Source
This commit is contained in:
Treehugger Robot
2021-01-05 10:23:02 +00:00
committed by Gerrit Code Review
parent 89e83dc8ec 70e152e377
commit e55e094041
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vndk/snapshot/gen_buildfiles.py
View File

@@ -568,19 +568,23 @@ class GenBuildFile(object):
name = module_names[prebuilt] name = module_names[prebuilt]
else: else:
name = os.path.splitext(prebuilt)[0] name = os.path.splitext(prebuilt)[0]
vendor_available = str(
prebuilt not in self._vndk_private[arch]).lower()
product_available = '' product_available = ''
# if vndkproduct.libraries.txt is empty, make the VNDKs available to product by default. # if vndkproduct.libraries.txt is empty, make the VNDKs available to product by default.
if not self._vndk_product[arch] or prebuilt in self._vndk_product[arch]: if not self._vndk_product[arch] or prebuilt in self._vndk_product[arch]:
product_available = '{ind}product_available: {available},\n'.format( product_available = '{ind}product_available: true,\n'.format(
ind=self.INDENT, available=vendor_available) ind=self.INDENT)
vndk_sp = '' vndk_sp = ''
if is_vndk_sp: if is_vndk_sp:
vndk_sp = '{ind}{ind}support_system_process: true,\n'.format( vndk_sp = '{ind}{ind}support_system_process: true,\n'.format(
ind=self.INDENT) ind=self.INDENT)
vndk_private = ''
if prebuilt in self._vndk_private[arch]:
vndk_private = '{ind}{ind}private: true,\n'.format(
ind=self.INDENT)
notice = get_notice_file(prebuilt) notice = get_notice_file(prebuilt)
arch_props = get_arch_props(prebuilt, arch, src_paths) arch_props = get_arch_props(prebuilt, arch, src_paths)
@@ -593,11 +597,12 @@ class GenBuildFile(object):
'{ind}version: "{ver}",\n' '{ind}version: "{ver}",\n'
'{ind}target_arch: "{target_arch}",\n' '{ind}target_arch: "{target_arch}",\n'
'{binder32bit}' '{binder32bit}'
'{ind}vendor_available: {vendor_available},\n' '{ind}vendor_available: true,\n'
'{product_available}' '{product_available}'
'{ind}vndk: {{\n' '{ind}vndk: {{\n'
'{ind}{ind}enabled: true,\n' '{ind}{ind}enabled: true,\n'
'{vndk_sp}' '{vndk_sp}'
'{vndk_private}'
'{ind}}},\n' '{ind}}},\n'
'{notice}' '{notice}'
'{arch_props}' '{arch_props}'
@@ -607,9 +612,9 @@ class GenBuildFile(object):
ver=self._vndk_version, ver=self._vndk_version,
target_arch=arch, target_arch=arch,
binder32bit=binder32bit, binder32bit=binder32bit,
vendor_available=vendor_available,
product_available=product_available, product_available=product_available,
vndk_sp=vndk_sp, vndk_sp=vndk_sp,
vndk_private=vndk_private,
notice=notice, notice=notice,
arch_props=arch_props)) arch_props=arch_props))