StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I45302ff0 into eclair-mr2

Browse Source 
* changes:
  make prebuilt .apks require LOCAL_CERTIFICATE
This commit is contained in:
Android (Google) Code Review
2009-12-11 14:50:33 -08:00
parent f7b3211e08 45302ff00b
commit 9bc88726cb
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/prebuilt.mk
View File

@@ -43,9 +43,16 @@ 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. # If this is not an absolute certificate, assign it to a generic one.
ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./)
LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE) LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE)
@@ -54,7 +61,6 @@ endif
PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8
PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
PACKAGES := $(PACKAGES) $(LOCAL_MODULE) PACKAGES := $(PACKAGES) $(LOCAL_MODULE)
endif endif
ifneq ($(prebuilt_module_is_a_library),) ifneq ($(prebuilt_module_is_a_library),)