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

Add local mode to the script.

Browse Source 
Local mainline SDK artifacts can be built via
TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_sdks.sh

Bug: 260755259
Test: run locally
Change-Id: I0eb13441201d62db1686f2930957e33b4aa4ce37
This commit is contained in:
Alex Buynytskyy
2023-01-19 17:42:10 +00:00
parent 5f326eb40a
commit 56c36b3bb1
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tools/finalize_sdk.py
View File

@@ -22,8 +22,10 @@ COMPAT_README = Path('extensions/README.md')
BUILD_TARGET_TRAIN = 'train_build' BUILD_TARGET_TRAIN = 'train_build'
# This build target is used when fetching from a non-train build (XXXXXXXX) # This build target is used when fetching from a non-train build (XXXXXXXX)
BUILD_TARGET_CONTINUOUS = 'mainline_modules_sdks-userdebug' BUILD_TARGET_CONTINUOUS = 'mainline_modules_sdks-userdebug'
# The glob of sdk artifacts to fetch # The glob of sdk artifacts to fetch from remote build
ARTIFACT_PATTERN = 'mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip' ARTIFACT_PATTERN = 'mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip'
# The glob of sdk artifacts to fetch from local build
ARTIFACT_LOCAL_PATTERN = 'out/dist/mainline-sdks/for-latest-build/current/{module_name}/sdk/*.zip'
COMMIT_TEMPLATE = """Finalize artifacts for extension SDK %d COMMIT_TEMPLATE = """Finalize artifacts for extension SDK %d
Import from build id %s. Import from build id %s.
@@ -38,20 +40,27 @@ def fail(*args, **kwargs):
print(*args, file=sys.stderr, **kwargs) print(*args, file=sys.stderr, **kwargs)
sys.exit(1) sys.exit(1)
def fetch_artifacts(target, build_id, artifact_path): def fetch_artifacts(target, build_id, module_name):
tmpdir = Path(tempfile.TemporaryDirectory().name) tmpdir = Path(tempfile.TemporaryDirectory().name)
tmpdir.mkdir() tmpdir.mkdir()
print('Fetching %s from %s ...' % (artifact_path, target)) if args.local_mode:
fetch_cmd = [FETCH_ARTIFACT] artifact_path = ARTIFACT_LOCAL_PATTERN.format(module_name='*')
fetch_cmd.extend(['--bid', str(build_id)]) print('Copying %s to %s ...' % (artifact_path, tmpdir))
fetch_cmd.extend(['--target', target]) for file in glob.glob(artifact_path):
fetch_cmd.append(artifact_path) shutil.copy(file, tmpdir)
fetch_cmd.append(str(tmpdir)) else:
print("Running: " + ' '.join(fetch_cmd)) artifact_path = ARTIFACT_PATTERN.format(module_name=module_name)
try: print('Fetching %s from %s ...' % (artifact_path, target))
subprocess.check_output(fetch_cmd, stderr=subprocess.STDOUT) fetch_cmd = [FETCH_ARTIFACT]
except subprocess.CalledProcessError: fetch_cmd.extend(['--bid', str(build_id)])
fail('FAIL: Unable to retrieve %s artifact for build ID %s' % (artifact_path, build_id)) fetch_cmd.extend(['--target', target])
fetch_cmd.append(artifact_path)
fetch_cmd.append(str(tmpdir))
print("Running: " + ' '.join(fetch_cmd))
try:
subprocess.check_output(fetch_cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
fail('FAIL: Unable to retrieve %s artifact for build ID %s' % (artifact_path, build_id))
return tmpdir return tmpdir
def repo_for_sdk(filename): def repo_for_sdk(filename):
@@ -108,12 +117,13 @@ parser.add_argument('-b', '--bug', type=int, required=True, help='The bug number
parser.add_argument('-r', '--readme', required=True, help='Version history entry to add to %s' % (COMPAT_REPO / COMPAT_README)) parser.add_argument('-r', '--readme', required=True, help='Version history entry to add to %s' % (COMPAT_REPO / COMPAT_README))
parser.add_argument('-a', '--amend_last_commit', action="store_true", help='Amend current HEAD commits instead of making new commits.') parser.add_argument('-a', '--amend_last_commit', action="store_true", help='Amend current HEAD commits instead of making new commits.')
parser.add_argument('-m', '--modules', action='append', help='Modules to include. Can be provided multiple times, or not at all for all modules.') parser.add_argument('-m', '--modules', action='append', help='Modules to include. Can be provided multiple times, or not at all for all modules.')
parser.add_argument('-l', '--local_mode', action="store_true", help='Local mode: use locally built artifacts and don\'t upload the result to Gerrit.')
parser.add_argument('bid', help='Build server build ID') parser.add_argument('bid', help='Build server build ID')
args = parser.parse_args() args = parser.parse_args()
build_target = BUILD_TARGET_TRAIN if args.bid[0] == 'T' else BUILD_TARGET_CONTINUOUS build_target = BUILD_TARGET_TRAIN if args.bid[0] == 'T' else BUILD_TARGET_CONTINUOUS
branch_name = 'finalize-%d' % args.finalize_sdk branch_name = 'finalize-%d' % args.finalize_sdk
cmdline = shlex.join([x for x in sys.argv if x not in ['-a', '--amend_last_commit']]) cmdline = shlex.join([x for x in sys.argv if x not in ['-a', '--amend_last_commit', '-l', '--local_mode']])
commit_message = COMMIT_TEMPLATE % (args.finalize_sdk, args.bid, cmdline, args.bug) commit_message = COMMIT_TEMPLATE % (args.finalize_sdk, args.bid, cmdline, args.bug)
module_names = args.modules or ['*'] module_names = args.modules or ['*']
@@ -124,7 +134,7 @@ if compat_dir.is_dir():
created_dirs = defaultdict(set) created_dirs = defaultdict(set)
for m in module_names: for m in module_names:
tmpdir = fetch_artifacts(build_target, args.bid, ARTIFACT_PATTERN.format(module_name=m)) tmpdir = fetch_artifacts(build_target, args.bid, m)
for f in tmpdir.iterdir(): for f in tmpdir.iterdir():
repo = repo_for_sdk(f.name) repo = repo_for_sdk(f.name)
dir = dir_for_sdk(f.name, args.finalize_sdk) dir = dir_for_sdk(f.name, args.finalize_sdk)
@@ -153,6 +163,9 @@ for m in module_names:
shutil.copy(src_file, dest_file) shutil.copy(src_file, dest_file)
created_dirs[COMPAT_REPO].add(dest_dir.relative_to(COMPAT_REPO)) created_dirs[COMPAT_REPO].add(dest_dir.relative_to(COMPAT_REPO))
if args.local_mode:
sys.exit(0)
subprocess.check_output(['repo', 'start', branch_name] + list(created_dirs.keys())) subprocess.check_output(['repo', 'start', branch_name] + list(created_dirs.keys()))
print('Running git commit') print('Running git commit')
for repo in created_dirs: for repo in created_dirs: