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

Merge "Install vndkcore and vndkprivate library list" am: 6863ada102

Browse Source 
am: 93e5dc5f39

Change-Id: Ifbfa9f1ebe54dd0e125c829f664d80336c34bad9
This commit is contained in:
Kiyoung Kim
2019-10-07 18:26:52 -07:00
committed by android-build-merger
parent 796923e350 93e5dc5f39
commit cb153665c5
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vndk/snapshot/gen_buildfiles.py
View File

@@ -60,7 +60,11 @@ class GenBuildFile(object):
""" """
INDENT = ' ' INDENT = ' '
ETC_MODULES = [ ETC_MODULES = [
'ld.config.txt', 'llndk.libraries.txt', 'vndksp.libraries.txt' 'ld.config.txt',
'llndk.libraries.txt',
'vndksp.libraries.txt',
'vndkcore.libraries.txt',
'vndkprivate.libraries.txt'
] ]
def __init__(self, install_dir, vndk_version): def __init__(self, install_dir, vndk_version):
@@ -77,10 +81,12 @@ class GenBuildFile(object):
self._snapshot_archs = utils.get_snapshot_archs(install_dir) self._snapshot_archs = utils.get_snapshot_archs(install_dir)
self._root_bpfile = os.path.join(install_dir, utils.ROOT_BP_PATH) self._root_bpfile = os.path.join(install_dir, utils.ROOT_BP_PATH)
self._common_bpfile = os.path.join(install_dir, utils.COMMON_BP_PATH) self._common_bpfile = os.path.join(install_dir, utils.COMMON_BP_PATH)
self._vndk_core = self._parse_lib_list('vndkcore.libraries.txt') self._vndk_core = self._parse_lib_list(
os.path.basename(self._etc_paths['vndkcore.libraries.txt']))
self._vndk_sp = self._parse_lib_list( self._vndk_sp = self._parse_lib_list(
os.path.basename(self._etc_paths['vndksp.libraries.txt'])) os.path.basename(self._etc_paths['vndksp.libraries.txt']))
self._vndk_private = self._parse_lib_list('vndkprivate.libraries.txt') self._vndk_private = self._parse_lib_list(
os.path.basename(self._etc_paths['vndkprivate.libraries.txt']))
self._modules_with_notice = self._get_modules_with_notice() self._modules_with_notice = self._get_modules_with_notice()
def _get_etc_paths(self): def _get_etc_paths(self):

5
vndk/snapshot/update.py
View File

@@ -151,6 +151,11 @@ def post_processe_files_if_needed(vndk_version):
for file_to_rename in files_to_add_version_suffix: for file_to_rename in files_to_add_version_suffix:
add_version_suffix(file_to_rename) add_version_suffix(file_to_rename)
files_to_enforce_version_suffix = ('vndkcore.libraries.txt',
'vndkprivate.libraries.txt')
for file_to_rename in files_to_enforce_version_suffix:
add_version_suffix(file_to_rename)
def update_buildfiles(buildfile_generator): def update_buildfiles(buildfile_generator):
logging.info('Generating root Android.bp file...') logging.info('Generating root Android.bp file...')