LOCAL_CERTIFICATE only applies to APPS. (f0534c28) · Commits · e / os / android_build

core/prebuilt_internal.mk

+4 −7

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ endif

		endif # LOCAL_STRIP_MODULE not true

		ifeq ($(LOCAL_MODULE_CLASS),APPS)
		PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

		ifeq ($(LOCAL_CERTIFICATE),EXTERNAL)
		@@ -121,11 +122,9 @@ ifeq ($(LOCAL_CERTIFICATE),EXTERNAL)
		$(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
		endif
		ifeq ($(LOCAL_CERTIFICATE),)
		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 "$(my_prebuilt_src_file)")
		endif
		else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED)
		# The magic string "PRESIGNED" means this package is already checked
		# signed with its release key.
		@@ -149,8 +148,6 @@ else
		$(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem
		endif

		ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),)

		# Disable dex-preopt of prebuilts to save space
		LOCAL_DEX_PREOPT := false