Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0

This commit is contained in:
Wolfgang Wiedmeyer 2015-12-26 09:22:30 +01:00
commit a7da2325ef
2 changed files with 5 additions and 1 deletions

View File

@ -118,9 +118,12 @@ update-cm-system-api: $(INTERNAL_PLATFORM_CM_SYSTEM_API_FILE) | $(ACP)
.PHONY: update-cm-prebuilts-latest-public-api .PHONY: update-cm-prebuilts-latest-public-api
current_sdk_release_text_file := $(CM_SRC_API_DIR)/$(cm_last_released_sdk_version).txt current_sdk_release_text_file := $(CM_SRC_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 -e ${CL_GRN}"Publishing cm_current.txt as latest API release"${CL_RST}
$(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}
$(hide) $(ACP) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE) $(current_system_api_release_text_file)
endif endif

View File

@ -18,7 +18,8 @@ PRODUCT_PACKAGES += \
PhaseBeam \ PhaseBeam \
PhotoTable \ PhotoTable \
SoundRecorder \ SoundRecorder \
PhotoPhase PhotoPhase \
Screencast
# Extra tools in CM # Extra tools in CM
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \