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

Merge "Add root directory when copying owner file."

Browse Source
This commit is contained in:
Rob Seymour
2022-02-04 00:08:42 +00:00
committed by Gerrit Code Review
parent 847b63f48d 2ff1e6fc78
commit 1b1e747351
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vndk/snapshot/update.py
View File

@@ -165,9 +165,9 @@ def update_buildfiles(buildfile_generator):
logging.info('Generating Android.bp files...') logging.info('Generating Android.bp files...')
buildfile_generator.generate_android_bp() buildfile_generator.generate_android_bp()
def copy_owners(install_dir): def copy_owners(root_dir, install_dir):
path = os.path.dirname(__file__) path = os.path.dirname(__file__)
shutil.copy(os.path.join(path, 'OWNERS'), install_dir) shutil.copy(os.path.join(root_dir, path, 'OWNERS'), install_dir)
def check_gpl_license(license_checker): def check_gpl_license(license_checker):
try: try:
@@ -253,7 +253,7 @@ def main():
'before installing new snapshot.'.format(ver=vndk_version)) 'before installing new snapshot.'.format(ver=vndk_version))
utils.set_logging_config(args.verbose) utils.set_logging_config(args.verbose)
root_dir = os.getcwd()
os.chdir(install_dir) os.chdir(install_dir)
if not args.use_current_branch: if not args.use_current_branch:
@@ -275,7 +275,7 @@ def main():
buildfile_generator = GenBuildFile(install_dir, vndk_version) buildfile_generator = GenBuildFile(install_dir, vndk_version)
update_buildfiles(buildfile_generator) update_buildfiles(buildfile_generator)
copy_owners(install_dir) copy_owners(root_dir, install_dir)
if not local: if not local:
license_checker = GPLChecker(install_dir, ANDROID_BUILD_TOP, license_checker = GPLChecker(install_dir, ANDROID_BUILD_TOP,