p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 9bc88726: Merge change I45302ff0 into eclair-mr2 

Merge commit '9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp

* commit '9bc88726cb24e92007d42c126ec094e687b3905f':
  make prebuilt .apks require LOCAL_CERTIFICATE
This commit is contained in:
Doug Zongker 2009-12-11 14:54:54 -08:00 committed by Android Git Automerger
parent be4eca1894 9bc88726cb
commit 39ecb46ed1
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/prebuilt.mk
View File

@ -43,18 +43,24 @@ endif
endif endif
ifeq ($(LOCAL_CERTIFICATE),) ifeq ($(LOCAL_CERTIFICATE),)
# can't re-sign this package, so predexopt is not available. ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)
# It is now a build error to add a prebuilt .apk without
# specifying a key for it.
$(error No LOCAL_CERTIFICATE specified for prebuilt "$(LOCAL_SRC_FILES)")
endif
else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
# The magic string "PRESIGNED" means this package is already checked
# signed with its release key.
# Can't re-sign this package, so predexopt is not available.
else else
# If this is not an absolute certificate, assign it to a generic one.
ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./)
LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE)
endif
# If this is not an absolute certificate, assign it to a generic one. PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE) PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
endif
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
endif endif
ifneq ($(prebuilt_module_is_a_library),) ifneq ($(prebuilt_module_is_a_library),)