diff options
Diffstat (limited to 'core/package_internal.mk')
-rw-r--r-- | core/package_internal.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index 75cc547be..31cb01eb0 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk | |||
@@ -88,7 +88,7 @@ else | |||
88 | endif | 88 | endif |
89 | 89 | ||
90 | # If LOCAL_MODULE matches a rule in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES, | 90 | # If LOCAL_MODULE matches a rule in PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES, |
91 | # override the manfest package name by the (first) rule matched | 91 | # override the manifest package name by the (first) rule matched |
92 | override_manifest_name := $(strip $(word 1,\ | 92 | override_manifest_name := $(strip $(word 1,\ |
93 | $(foreach rule,$(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES),\ | 93 | $(foreach rule,$(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES),\ |
94 | $(eval _pkg_name_pat := $(call word-colon,1,$(rule)))\ | 94 | $(eval _pkg_name_pat := $(call word-colon,1,$(rule)))\ |
@@ -100,7 +100,7 @@ override_manifest_name := $(strip $(word 1,\ | |||
100 | )) | 100 | )) |
101 | 101 | ||
102 | ifneq (,$(override_manifest_name)) | 102 | ifneq (,$(override_manifest_name)) |
103 | # Note: this can override LOCAL_MANFEST_PACKAGE_NAME value set in Android.mk | 103 | # Note: this can override LOCAL_MANIFEST_PACKAGE_NAME value set in Android.mk |
104 | LOCAL_MANIFEST_PACKAGE_NAME := $(override_manifest_name) | 104 | LOCAL_MANIFEST_PACKAGE_NAME := $(override_manifest_name) |
105 | endif | 105 | endif |
106 | 106 | ||
@@ -535,6 +535,7 @@ endif | |||
535 | ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) | 535 | ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) |
536 | LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) | 536 | LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) |
537 | endif | 537 | endif |
538 | include $(BUILD_SYSTEM)/app_certificate_validate.mk | ||
538 | private_key := $(LOCAL_CERTIFICATE).pk8 | 539 | private_key := $(LOCAL_CERTIFICATE).pk8 |
539 | certificate := $(LOCAL_CERTIFICATE).x509.pem | 540 | certificate := $(LOCAL_CERTIFICATE).x509.pem |
540 | additional_certificates := $(foreach c,$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8) | 541 | additional_certificates := $(foreach c,$(LOCAL_ADDITIONAL_CERTIFICATES), $(c).x509.pem $(c).pk8) |