Merge "Add 'license' module to the generated Android.bp of VNDK snapshots" am: 189f4b5005 am: 405a8671f4 am: bdb4270c2e
Original change: https://android-review.googlesource.com/c/platform/development/+/1885755 Change-Id: I6109cf149d3aa8e9a768dc8208af0ac37e072414
This commit is contained in:
@@ -173,6 +173,10 @@ class GenBuildFile(object):
|
|||||||
with open(self._root_bpfile, 'w') as bpfile:
|
with open(self._root_bpfile, 'w') as bpfile:
|
||||||
bpfile.write(self._gen_autogen_msg('/'))
|
bpfile.write(self._gen_autogen_msg('/'))
|
||||||
bpfile.write('\n')
|
bpfile.write('\n')
|
||||||
|
bpfile.write(self._gen_license_package())
|
||||||
|
bpfile.write('\n')
|
||||||
|
bpfile.write(self._gen_license())
|
||||||
|
bpfile.write('\n')
|
||||||
bpfile.write('\n'.join(prebuilt_buildrules))
|
bpfile.write('\n'.join(prebuilt_buildrules))
|
||||||
bpfile.write('\n')
|
bpfile.write('\n')
|
||||||
|
|
||||||
@@ -185,6 +189,8 @@ class GenBuildFile(object):
|
|||||||
self._vndk_version))
|
self._vndk_version))
|
||||||
with open(self._common_bpfile, 'w') as bpfile:
|
with open(self._common_bpfile, 'w') as bpfile:
|
||||||
bpfile.write(self._gen_autogen_msg('/'))
|
bpfile.write(self._gen_autogen_msg('/'))
|
||||||
|
bpfile.write('\n')
|
||||||
|
bpfile.write(self._gen_license_package())
|
||||||
for module in self._modules_with_notice:
|
for module in self._modules_with_notice:
|
||||||
bpfile.write('\n')
|
bpfile.write('\n')
|
||||||
bpfile.write(self._gen_notice_filegroup(module))
|
bpfile.write(self._gen_notice_filegroup(module))
|
||||||
@@ -258,6 +264,8 @@ class GenBuildFile(object):
|
|||||||
with open(bpfile_path, 'w') as bpfile:
|
with open(bpfile_path, 'w') as bpfile:
|
||||||
bpfile.write(self._gen_autogen_msg('/'))
|
bpfile.write(self._gen_autogen_msg('/'))
|
||||||
bpfile.write('\n')
|
bpfile.write('\n')
|
||||||
|
bpfile.write(self._gen_license_package())
|
||||||
|
bpfile.write('\n')
|
||||||
bpfile.write('\n'.join(vndk_core_buildrules))
|
bpfile.write('\n'.join(vndk_core_buildrules))
|
||||||
bpfile.write('\n')
|
bpfile.write('\n')
|
||||||
bpfile.write('\n'.join(vndk_sp_buildrules))
|
bpfile.write('\n'.join(vndk_sp_buildrules))
|
||||||
@@ -284,6 +292,28 @@ class GenBuildFile(object):
|
|||||||
'development/vndk/snapshot/gen_buildfiles.py\n'
|
'development/vndk/snapshot/gen_buildfiles.py\n'
|
||||||
'{0}{0} DO NOT EDIT\n'.format(comment_char))
|
'{0}{0} DO NOT EDIT\n'.format(comment_char))
|
||||||
|
|
||||||
|
def _gen_license_package(self):
|
||||||
|
""" Generates license package for VNDK snapshot libs """
|
||||||
|
return ('package {{\n'
|
||||||
|
'{ind}default_applicable_licenses: ["prebuilts_vndk_v{version}_license"],\n'
|
||||||
|
'}}\n'.format(
|
||||||
|
ind=self.INDENT,
|
||||||
|
version=self._vndk_version))
|
||||||
|
|
||||||
|
def _gen_license(self):
|
||||||
|
""" Generates license module.
|
||||||
|
|
||||||
|
It uses license files for all VNDK snapshot libraries in common/NOTICE_FILES directory.
|
||||||
|
"""
|
||||||
|
return ('license {{\n'
|
||||||
|
'{ind}name: "prebuilts_vndk_v{version}_license",\n'
|
||||||
|
'{ind}visibility: [":__subpackages__"],\n'
|
||||||
|
'{ind}license_text: ["{notice_files}"],\n'
|
||||||
|
'}}\n'.format(
|
||||||
|
ind=self.INDENT,
|
||||||
|
version=self._vndk_version,
|
||||||
|
notice_files=os.path.join(utils.NOTICE_FILES_DIR_PATH, '*.txt')))
|
||||||
|
|
||||||
def _get_versioned_name(self,
|
def _get_versioned_name(self,
|
||||||
prebuilt,
|
prebuilt,
|
||||||
arch,
|
arch,
|
||||||
|
|||||||
Reference in New Issue
Block a user