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

Commit 19f72cd6 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Support PRESIGNED in soong_app_prebuilt.mk" am: d4079c50

am: 72abaabb

Change-Id: I9ba711b901dc497aaa6230ee8f3c8a39519432a9
parents c2f7760c 72abaabb
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -129,7 +129,15 @@ my_prebuilt_jni_libs :=
my_2nd_arch_prefix :=

PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
ifdef LOCAL_CERTIFICATE
ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
  # The magic string "PRESIGNED" means this package is already checked
  # signed with its release key.
  #
  # By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be
  # mentioned in apkcerts.txt (with certificate set to "PRESIGNED")
  # but the dexpreopt process will not try to re-sign the app.
  PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED
else ifneq ($(LOCAL_CERTIFICATE),)
  PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE)
  PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(patsubst %.x509.pem,%.pk8,$(LOCAL_CERTIFICATE))
endif