Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7cd7ea authored by Brian Swetland's avatar Brian Swetland Committed by Android (Google) Code Review
Browse files

Merge "Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK"

parents ee6bddc3 7a596055

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

core/main.mk

+3 −2
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ endif 
ifneq ($(PDK_BUILD_TYPE),)

  $(info PDK build type $(PDK_BUILD_TYPE))

  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

core/tasks/apicheck.mk

+1 −1
Original line number Diff line number Diff line
@@ -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