tequilaOS/platform_vendor_tequila
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: Kill colors

Browse source 
* Also exclude apickeck if cm sdk is disabled

Change-Id: I48fbb3b2c3130d2a5d49ca726883babea4e5a455
This commit is contained in:
Luca Stefani 2016-08-26 22:59:59 +02:00 committed by Gerrit Code Review
parent 90565e3335
commit 9b58af504a
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/core/maven_artifact.mk
View file

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

10
build/core/maven_artifact_publish.mk
View file

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

10
build/tasks/apicheck.mk
View file

@ -18,7 +18,7 @@
# #
# skip api check for PDK buid # 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 .PHONY: checkapi-cm
@ -75,9 +75,9 @@ $(eval $(call check-api, \
.PHONY: update-cm-public-api .PHONY: update-cm-public-api
update-cm-public-api: $(INTERNAL_CM_PLATFORM_API_FILE) | $(ACP) 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) $(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) $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE)
update-cm-api : update-cm-public-api 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 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) 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) $(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) $(hide) $(ACP) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE) $(current_system_api_release_text_file)
endif endif