Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 766c5343 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add a version code and version name to fsverity manifest APK"

parents c1edfc3b 658172d9

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -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_AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2

$(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_MANIFEST := $(FSVERITY_APK_MANIFEST_PATH)

$(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-path $(PRIVATE_FSVERITY) --aapt2-path $(PRIVATE_AAPT2) \

	    --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) \

	    --apk-manifest-path $(PRIVATE_MANIFEST) --framework-res $(PRIVATE_FRAMEWORK_RES) \

	    --output $@ \

tools/releasetools/fsverity_manifest_generator.py

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,14 @@ if __name__ == '__main__': 
      '--min-sdk-version',

      help='minimum supported sdk version of the generated manifest apk',

      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(

      '--framework-res',

      help='path to framework-res.apk',
@@ -98,6 +106,8 @@ if __name__ == '__main__': 
      "-A", os.path.join(temp_dir, "assets"),

      "-o", args.output,

      "--min-sdk-version", args.min_sdk_version,

      "--version-code", args.version_code,

      "--version-name", args.version_name,

      "-I", args.framework_res,

      "--manifest", args.apk_manifest_path])

  common.RunAndCheckOutput([args.apksigner_path, "sign", "--in", args.output,