build: Kill colors

* Also exclude apickeck if cm sdk is disabled

Change-Id: I48fbb3b2c3130d2a5d49ca726883babea4e5a455

build/core/maven_artifact.mk

@@ -48,7 +48,7 @@ $(LOCAL_PREBUILT_MODULE_FILE):
 		-Dmdep.overWriteReleases=true \
 		-Dtransitive=false \
 		-DoutputDirectory=$(dir $@)
-	@echo -e ${CL_GRN}"Download:"${CL_RST}" $@"
+	@echo "Download: $@"
 
 ifneq ($(filter-out disabled, $(LOCAL_JACK_ENABLED)),)
 ifneq ($(LOCAL_MAVEN_PACKAGING),apk)

build/core/maven_artifact_publish.mk

@@ -38,17 +38,17 @@ $(full_target): artifact_path ?= $(basename $(path_to_file))
 
 ifdef LOCAL_MAVEN_TARGET_MODULE
 $(full_target): $(LOCAL_MAVEN_TARGET_MODULE) $(path_to_file) $(artifact_path) $(ACP)
-	@echo -e ${CL_GRN}"Renaming generated sdk javalib aar"${CL_RST}
+	@echo "Renaming generated sdk javalib aar"
 	$(hide) $(ACP) $(path_to_file) $(artifact_path)
-	@echo -e ${CL_GRN}"Publishing to Maven"${CL_RST}
-	$(hide) mvn -e -X gpg:sign-and-deploy-file \
-		    -DpomFile=$(pomfile) \
+	@echo "Publishing to Maven"
+		$(hide) mvn -e -X gpg:sign-and-deploy-file \
+			-DpomFile=$(pomfile) \
 			-Durl=$(repo) \
 			-Dfile=$(artifact_path) \
 			-DrepositoryId=$(repoId) \
 			-Dclassifier=$(classifier) \
 			-Dsources=$(sources) \
 			-Djavadoc=$(javadoc)
-	@echo -e ${CL_GRN}"Publishing:"${CL_RST}" $@"
+	@echo "Publishing: $@"
 endif
 $(LOCAL_MODULE): $(full_target)

build/tasks/apicheck.mk

@@ -18,7 +18,7 @@
 #
 
 # skip api check for PDK buid
-ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))
+ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK) $(TARGET_DISABLE_CMSDK)))
 
 .PHONY: checkapi-cm
 
@@ -75,9 +75,9 @@ $(eval $(call check-api, \
 
 .PHONY: update-cm-public-api
 update-cm-public-api: $(INTERNAL_CM_PLATFORM_API_FILE) | $(ACP)
-	@echo -e ${CL_GRN}"Copying cm_current.txt"${CL_RST}
+	@echo "Copying cm_current.txt"
 	$(hide) $(ACP) $(INTERNAL_CM_PLATFORM_API_FILE) $(FRAMEWORK_CM_PLATFORM_API_FILE)
-	@echo -e ${CL_GRN}"Copying cm_removed.txt"${CL_RST}
+	@echo "Copying cm_removed.txt"
 	$(hide) $(ACP) $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE)
 
 update-cm-api : update-cm-public-api
@@ -135,9 +135,9 @@ current_sdk_release_text_file := $(CM_SRC_API_DIR)/$(cm_last_released_sdk_versio
 current_system_api_release_text_file := $(CM_SRC_SYSTEM_API_DIR)/$(cm_last_released_sdk_version).txt
 
 update-cm-prebuilts-latest-public-api: $(FRAMEWORK_CM_PLATFORM_API_FILE) | $(ACP)
-	@echo -e ${CL_GRN}"Publishing cm_current.txt as latest API release"${CL_RST}
+	@echo "Publishing cm_current.txt as latest API release"
 	$(hide) $(ACP) $(FRAMEWORK_CM_PLATFORM_API_FILE) $(current_sdk_release_text_file)
-	@echo -e ${CL_GRN}"Publishing cm_current.txt as latest system API release"${CL_RST}
+	@echo "Publishing cm_current.txt as latest system API release"
 	$(hide) $(ACP) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE) $(current_system_api_release_text_file)
 
 endif