build: Re-add I_WANT_A_QUAIL_STAR

* This partially reverts commit c7d6cc2a9cda88c8b110f69d8e121a732d570aa7
* Move cmsdk check to checkapi-cm, android checkapi shouldn't be
  under this ifeq

Change-Id: Ia7c9853cc5f978ed533f2879367428eb1d64bd46

diff --git a/core/Makefile b/core/Makefile
index b19af31..bf826a7 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -1268,10 +1268,12 @@ endef
 $(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE)
        $(call build-systemimage-target,$@)
 
-ifneq ($(TARGET_DISABLE_CMSDK), true)
+ifndef I_WANT_A_QUAIL_STAR
 $(BUILT_SYSTEMIMAGE): checkapi
+ifneq ($(TARGET_DISABLE_CMSDK),true)
 $(BUILT_SYSTEMIMAGE): checkapi-cm
 endif
+endif
 
 INSTALLED_SYSTEMIMAGE := $(PRODUCT_OUT)/system.img
 SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT)