From 7a5960555b229cca5a7d074ea9e139ebd5a6600f Mon Sep 17 00:00:00 2001 From: Brian Swetland Date: Fri, 23 Mar 2012 16:04:13 -0700 Subject: [PATCH] Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK BUILD_PDK and some of the other infrastructure will go away once we're done with the new new PDK work, but for now don't disturb that stuff. Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a --- core/Makefile | 2 +- core/main.mk | 5 +++-- core/tasks/apicheck.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 173932c1bf..e005485eb2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -631,7 +631,7 @@ endef # Recovery image # If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true -ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY) $(BUILD_TINY_ANDROID) $(BUILD_PDK))) +ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY) $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK))) INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img diff --git a/core/main.mk b/core/main.mk index ab9d52dceb..a038d5dcf9 100644 --- a/core/main.mk +++ b/core/main.mk @@ -218,7 +218,8 @@ ifeq (2,$(words $(PDK_BUILD_TYPE))) endif ifneq ($(PDK_BUILD_TYPE),) $(info PDK build type $(PDK_BUILD_TYPE)) - BUILD_PDK:= true + BUILD_PDK:=true + TARGET_BUILD_PDK:=true include pdk/build/pdk.mk # force droid target MAKECMDGOALS:= $(subst $(PDK_BUILD_TYPE),droid,$(MAKECMDGOALS)) @@ -729,7 +730,7 @@ bootimage: $(INSTALLED_BOOTIMAGE_TARGET) ifeq ($(BUILD_TINY_ANDROID), true) INSTALLED_RECOVERYIMAGE_TARGET := endif -ifneq ($(BUILD_PDK),) +ifneq ($(TARGET_BUILD_PDK),) INSTALLED_RECOVERYIMAGE_TARGET := endif diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk index b3d800b4e3..8d9928eef1 100644 --- a/core/tasks/apicheck.mk +++ b/core/tasks/apicheck.mk @@ -18,7 +18,7 @@ # # skip api check for TINY_ANDROID and PDK buid -ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(BUILD_PDK))) +ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK))) .PHONY: checkapi