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

Commit 641e61cb authored by Shinichiro Hamaji's avatar Shinichiro Hamaji
Browse files

Make apks depend on their certificates 

Bug: 27954979
Change-Id: I02db576cb80cbb9dd684d931da02e1b3b3efdf37
parent b6f2c8fa

core/dpi_specific_apk.mk

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
dpi_apk_name := $(LOCAL_MODULE)_$(my_dpi)

dpi_intermediate := $(call intermediates-dir-for,APPS,$(dpi_apk_name))

built_dpi_apk := $(dpi_intermediate)/package.apk

additional_certificates := $(foreach c,$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)



# Set up all the target-specific variables.

$(built_dpi_apk): PRIVATE_MODULE := $(dpi_apk_name)
@@ -27,8 +28,8 @@ $(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_ab 
$(built_dpi_apk): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis)

$(built_dpi_apk): PRIVATE_PRIVATE_KEY := $(private_key)

$(built_dpi_apk): PRIVATE_CERTIFICATE := $(certificate)

$(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\

    $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)

$(built_dpi_apk): $(additional_certificates)

$(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)



ifneq ($(full_classes_jar),)

$(built_dpi_apk): PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc

core/package_internal.mk

+3 −2
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) 
endif

private_key := $(LOCAL_CERTIFICATE).pk8

certificate := $(LOCAL_CERTIFICATE).x509.pem

additional_certificates := $(foreach c,$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)



$(LOCAL_BUILT_MODULE): $(private_key) $(certificate) $(SIGNAPK_JAR)

$(LOCAL_BUILT_MODULE): PRIVATE_PRIVATE_KEY := $(private_key)
@@ -377,8 +378,8 @@ $(LOCAL_BUILT_MODULE): PRIVATE_CERTIFICATE := $(certificate) 
PACKAGES.$(LOCAL_PACKAGE_NAME).PRIVATE_KEY := $(private_key)

PACKAGES.$(LOCAL_PACKAGE_NAME).CERTIFICATE := $(certificate)



$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(foreach c,\

    $(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8)

$(LOCAL_BUILT_MODULE): $(additional_certificates)

$(LOCAL_BUILT_MODULE): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)



# Define the rule to build the actual package.

$(LOCAL_BUILT_MODULE): $(AAPT)

core/prebuilt_internal.mk

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) 
  LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)

  PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1



  $(built_module) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem

  $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8

  $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

endif
@@ -204,6 +205,7 @@ else 
  PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

  PACKAGES := $(PACKAGES) $(LOCAL_MODULE)



  $(built_module) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem

  $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8

  $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

endif
@@ -283,6 +285,7 @@ $(error You must put all the split source apks in the same folder: $(LOCAL_PACKA 
endif

my_src_dir := $(LOCAL_PATH)/$(my_src_dir)



$(built_apk_splits) : $(LOCAL_CERTIFICATE).pk8 $(LOCAL_CERTIFICATE).x509.pem

$(built_apk_splits) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8

$(built_apk_splits) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem

$(built_apk_splits) : $(built_module_path)/%.apk : $(my_src_dir)/%.apk | $(AAPT)