Make change and version bump to UP1A.230218.001
Snap for 9626528 from 949b842596
to udc-release
Change-Id: I578594ba5159baba3be3dd6027ebdb4c6c25aa96
This commit is contained in:
@@ -18,4 +18,4 @@
|
||||
# (like "CRB01"). It must be a single word, and is
|
||||
# capitalized by convention.
|
||||
|
||||
BUILD_ID=UP1A.230217.003
|
||||
BUILD_ID=UP1A.230218.001
|
||||
|
@@ -43,6 +43,7 @@ PRODUCT_PACKAGES += \
|
||||
CaptivePortalLogin \
|
||||
CertInstaller \
|
||||
CredentialManager \
|
||||
DeviceAsWebcam \
|
||||
DocumentsUI \
|
||||
DownloadProviderUi \
|
||||
EasterEgg \
|
||||
|
22
tools/finalization/build-step-1.sh
Executable file
22
tools/finalization/build-step-1.sh
Executable file
@@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
function finalize_main() {
|
||||
local top="$(dirname "$0")"/../..
|
||||
|
||||
# default target to modify tree and build SDK
|
||||
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
|
||||
|
||||
# Build finalization artifacts.
|
||||
source $top/build/make/tools/finalization/finalize-aidl-vndk-sdk-resources.sh
|
||||
|
||||
# This command tests:
|
||||
# The release state for AIDL.
|
||||
# ABI difference between user and userdebug builds.
|
||||
# Resource/SDK finalization.
|
||||
AIDL_FROZEN_REL=true $m
|
||||
}
|
||||
|
||||
finalize_main
|
||||
|
@@ -302,6 +302,8 @@ def RunAndCheckOutput(args, verbose=None, **kwargs):
|
||||
Raises:
|
||||
ExternalError: On non-zero exit from the command.
|
||||
"""
|
||||
if verbose is None:
|
||||
verbose = OPTIONS.verbose
|
||||
proc = Run(args, verbose=verbose, **kwargs)
|
||||
output, _ = proc.communicate()
|
||||
if output is None:
|
||||
@@ -2903,13 +2905,12 @@ def ZipDelete(zip_filename, entries, force=False):
|
||||
|
||||
fd, new_zipfile = tempfile.mkstemp(dir=os.path.dirname(zip_filename))
|
||||
os.close(fd)
|
||||
cmd = ["zip2zip", "-i", zip_filename, "-o", new_zipfile]
|
||||
for entry in entries:
|
||||
cmd.append("-x")
|
||||
cmd.append(entry)
|
||||
RunAndCheckOutput(cmd)
|
||||
|
||||
with zipfile.ZipFile(new_zipfile, 'w') as zout:
|
||||
for item in zin.infolist():
|
||||
if item.filename in entries:
|
||||
continue
|
||||
buffer = zin.read(item.filename)
|
||||
zout.writestr(item, buffer)
|
||||
|
||||
os.replace(new_zipfile, zip_filename)
|
||||
|
||||
|
Reference in New Issue
Block a user