From 46526ff69ea3e1a2a7ea11667924dcf942060ba1 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 11 Sep 2014 17:40:29 -0700 Subject: [PATCH] Conditionally skip boot jars package name check. In PDK build, or when a product adds its own boot jars we skip the check. Bug: 17434570 Change-Id: I9096ebfa38280c5d2ca84bdc489b455876103f5d --- core/tasks/boot_jars_package_check.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk index 39144aa72..188c26740 100644 --- a/core/tasks/boot_jars_package_check.mk +++ b/core/tasks/boot_jars_package_check.mk @@ -16,6 +16,8 @@ # Rules to check if classes in the boot jars are from the whitelisted packages. # +ifneq ($(SKIP_BOOT_JARS_CHECK),true) +ifneq ($(TARGET_BUILD_PDK),true) ifdef PRODUCT_BOOT_JARS intermediates := $(call intermediates-dir-for, PACKAGING, boot-jars-package-check,,COMMON) @@ -40,3 +42,5 @@ check-boot-jars : $(stamp) droidcore : check-boot-jars endif # PRODUCT_BOOT_JARS +endif # TARGET_BUILD_PDK not true +endif # SKIP_BOOT_JARS_CHECK not true