StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a version code and version name to fsverity manifest APK" am: 766c5343e2 am: ff606ad9b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1963641

Change-Id: I20237ad2f16d1857b2e0718c20688a230f14cec4
This commit is contained in:
Treehugger Robot
2022-01-28 00:36:23 +00:00
committed by Automerger Merge Worker
parent e72c026778 ff606ad9b6
commit 48e67cefd1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -2869,6 +2869,8 @@ FSVERITY_APK_MANIFEST_PATH := system/security/fsverity/AndroidManifest.xml
$(FSVERITY_APK_OUT): PRIVATE_FSVERITY := $(HOST_OUT_EXECUTABLES)/fsverity $(FSVERITY_APK_OUT): PRIVATE_FSVERITY := $(HOST_OUT_EXECUTABLES)/fsverity
$(FSVERITY_APK_OUT): PRIVATE_AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2 $(FSVERITY_APK_OUT): PRIVATE_AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2
$(FSVERITY_APK_OUT): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK) $(FSVERITY_APK_OUT): PRIVATE_MIN_SDK_VERSION := $(DEFAULT_APP_TARGET_SDK)
$(FSVERITY_APK_OUT): PRIVATE_VERSION_CODE := $(PLATFORM_SDK_VERSION)
$(FSVERITY_APK_OUT): PRIVATE_VERSION_NAME := $(APPS_DEFAULT_VERSION_NAME)
$(FSVERITY_APK_OUT): PRIVATE_APKSIGNER := $(HOST_OUT_EXECUTABLES)/apksigner $(FSVERITY_APK_OUT): PRIVATE_APKSIGNER := $(HOST_OUT_EXECUTABLES)/apksigner
$(FSVERITY_APK_OUT): PRIVATE_MANIFEST := $(FSVERITY_APK_MANIFEST_PATH) $(FSVERITY_APK_OUT): PRIVATE_MANIFEST := $(FSVERITY_APK_MANIFEST_PATH)
$(FSVERITY_APK_OUT): PRIVATE_FRAMEWORK_RES := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk $(FSVERITY_APK_OUT): PRIVATE_FRAMEWORK_RES := $(call intermediates-dir-for,APPS,framework-res,,COMMON)/package-export.apk
@@ -2882,6 +2884,8 @@ $(FSVERITY_APK_OUT): $(HOST_OUT_EXECUTABLES)/fsverity_manifest_generator \
$(fsverity-metadata-targets) $(fsverity-metadata-targets)
$< --fsverity-path $(PRIVATE_FSVERITY) --aapt2-path $(PRIVATE_AAPT2) \ $< --fsverity-path $(PRIVATE_FSVERITY) --aapt2-path $(PRIVATE_AAPT2) \
--min-sdk-version $(PRIVATE_MIN_SDK_VERSION) \ --min-sdk-version $(PRIVATE_MIN_SDK_VERSION) \
--version-code $(PRIVATE_VERSION_CODE) \
--version-name $(PRIVATE_VERSION_NAME) \
--apksigner-path $(PRIVATE_APKSIGNER) --apk-key-path $(PRIVATE_KEY) \ --apksigner-path $(PRIVATE_APKSIGNER) --apk-key-path $(PRIVATE_KEY) \
--apk-manifest-path $(PRIVATE_MANIFEST) --framework-res $(PRIVATE_FRAMEWORK_RES) \ --apk-manifest-path $(PRIVATE_MANIFEST) --framework-res $(PRIVATE_FRAMEWORK_RES) \
--output $@ \ --output $@ \

10
tools/releasetools/fsverity_manifest_generator.py
View File

@@ -54,6 +54,14 @@ if __name__ == '__main__':
'--min-sdk-version', '--min-sdk-version',
help='minimum supported sdk version of the generated manifest apk', help='minimum supported sdk version of the generated manifest apk',
required=True) required=True)
p.add_argument(
'--version-code',
help='version code for the generated manifest apk',
required=True)
p.add_argument(
'--version-name',
help='version name for the generated manifest apk',
required=True)
p.add_argument( p.add_argument(
'--framework-res', '--framework-res',
help='path to framework-res.apk', help='path to framework-res.apk',
@@ -98,6 +106,8 @@ if __name__ == '__main__':
"-A", os.path.join(temp_dir, "assets"), "-A", os.path.join(temp_dir, "assets"),
"-o", args.output, "-o", args.output,
"--min-sdk-version", args.min_sdk_version, "--min-sdk-version", args.min_sdk_version,
"--version-code", args.version_code,
"--version-name", args.version_name,
"-I", args.framework_res, "-I", args.framework_res,
"--manifest", args.apk_manifest_path]) "--manifest", args.apk_manifest_path])
common.RunAndCheckOutput([args.apksigner_path, "sign", "--in", args.output, common.RunAndCheckOutput([args.apksigner_path, "sign", "--in", args.output,