StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hax: Disable system-api generation

Browse Source 
* Do we even need this? CMSDK doesn't annotate anything as SystemApi,
   and it fails on N.

Change-Id: I73e1021079e05ab56f96008446f12b086d8b41c6
This commit is contained in:
Steve Kondik
2016-08-29 05:44:13 -07:00
parent 21e414adad
commit a3765ca9ef
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/core/config.mk
View File

@@ -13,15 +13,10 @@
# limitations under the License. # limitations under the License.
CM_SRC_API_DIR := $(TOPDIR)prebuilts/cmsdk/api CM_SRC_API_DIR := $(TOPDIR)prebuilts/cmsdk/api
CM_SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/cmsdk/system-api
INTERNAL_CM_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_public_api.txt INTERNAL_CM_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_public_api.txt
INTERNAL_CM_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_removed.txt INTERNAL_CM_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_removed.txt
INTERNAL_CM_PLATFORM_SYSTEM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_system-api.txt
INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_system-removed.txt
FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt
FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt
FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-current.txt
FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-removed.txt
FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg_current.txt FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg_current.txt
BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk

51
build/tasks/apicheck.mk
View File

@@ -82,62 +82,11 @@ update-cm-public-api: $(INTERNAL_CM_PLATFORM_API_FILE) | $(ACP)
update-cm-api : update-cm-public-api update-cm-api : update-cm-public-api
#####################Check System API#####################
.PHONY: check-cm-system-api
checkapi-cm : check-cm-system-api
$(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE): cm-system-api-stubs-docs
# Check that the System API we're building hasn't broken the last-released
# SDK version.
$(eval $(call check-api, \
checksystemapi-cm-last, \
$(CM_SRC_SYSTEM_API_DIR)/$(cm_last_released_sdk_version).txt, \
$(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \
$(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
$(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
-hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 -hide 26 -hide 27 \
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
-error 16 -error 17 -error 18 , \
cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
check-cm-system-api, \
$(call doc-timestamp-for,cm-system-api-stubs) \
))
# Check that the System API we're building hasn't changed from the not-yet-released
# SDK version.
$(eval $(call check-api, \
checksystemapi-cm-current, \
$(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE), \
$(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \
$(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
$(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \
-error 2 -error 3 -error 4 -error 5 -error 6 \
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
-error 25 -error 26 -error 27, \
cat $(FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT), \
check-cm-system-api, \
$(call doc-timestamp-for,cm-system-api-stubs) \
))
.PHONY: update-cm-system-api
update-cm-api : update-cm-system-api
update-cm-system-api: $(INTERNAL_PLATFORM_CM_SYSTEM_API_FILE) | $(ACP)
@echo Copying cm_system-current.txt
$(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE)
@echo Copying cm_system-removed.txt
$(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE)
.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 "Publishing cm_current.txt as latest API release" @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 "Publishing cm_current.txt as latest system API release"
$(hide) $(ACP) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE) $(current_system_api_release_text_file)
endif endif