diff --git a/build/core/apicheck.mk b/build/core/apicheck.mk index b0df9391..796bcb16 100644 --- a/build/core/apicheck.mk +++ b/build/core/apicheck.mk @@ -49,12 +49,14 @@ $(eval $(call check-api, \ $(INTERNAL_CM_PLATFORM_API_FILE), \ $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \ - cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ + -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-public-api, \ - $(call doc-timestamp-for, cm-api-stubs) \ + $(call doc-timestamp-for,cm-api-stubs) \ )) - # Check that the API we're building hasn't changed from the not-yet-released # SDK version. $(eval $(call check-api, \ @@ -63,9 +65,13 @@ $(eval $(call check-api, \ $(INTERNAL_CM_PLATFORM_API_FILE), \ $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \ - cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ + -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-public-api, \ - $(call doc-timestamp-for, cm-api-stubs) \ + $(call doc-timestamp-for,cm-api-stubs) \ )) .PHONY: update-cm-public-api @@ -81,7 +87,7 @@ update-cm-api : update-cm-public-api .PHONY: check-cm-system-api checkapi-cm : check-cm-system-api -# Check that the Cyanogen System API we're building hasn't broken the last-released +# Check that the System API we're building hasn't broken the last-released # SDK version. $(eval $(call check-api, \ checksystemapi-cm-last, \ @@ -89,22 +95,29 @@ $(eval $(call check-api, \ $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \ $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ - cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ + -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) \ + $(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, \ + checkpublicapi-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), \ - cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ + -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) \ + $(call doc-timestamp-for,cm-system-api-stubs) \ )) .PHONY: update-cm-system-api diff --git a/build/core/apicheck_msg_current.txt b/build/core/apicheck_msg_current.txt new file mode 100644 index 00000000..f58858eb --- /dev/null +++ b/build/core/apicheck_msg_current.txt @@ -0,0 +1,143 @@ + +****************************** +You have tried to change the API from what has been previously approved. + +To make these errors go away, you have two choices: + 1) You can add "@hide" javadoc comments to the methods, etc. listed in the + errors above. + + 2) You can update current.txt by executing the following command: + make update-cm-api + + ^^^^^^^^^^^^^^^^^^ + CONGRATS YOU EARNED A STINKEYE FROM CID! + + + . `` + `+++++ ;++++' + +++++++ ;++++++' + ++++++++, ++++++++ + +++++++++ :++++++++` + +++++++++ +++++++++` + ++++++++++ +++++++++ + +++++++++ ++++++++++ + +++++++++: +++++++++ + :+++++++++ ;+++++++++ + +++++++++` +++++++++, + ++++++++++ `+++++++++ + +++++++++ ++++++++++ + +++++++++; +++++++++ + ,+++++++++ '+++++++++ + +++++++++. +++++++++, + '+++++++++ .+++++++++ + +++++++++ +++++++++' + +++++++++' +++++++++ + .+++++++++ '+++++++++ + +++++++++, +++++++++. + ;+++++++++ ,+++++++++ + +++++++++ +++++++++; + ++++++++++ .,;;+++++++++++++++++++++++++++++++++;,,. +++++++++ + `+++++++++ ,;++++++++++++++++++++++++++++++++++++++++++++++++++++++++',` ++++++++++ + +++++++++, :++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;. +++++++++` + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++: + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + :+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++; + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + `+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'. ,+++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' .++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' `++++++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ;++++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' +++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++; ++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++; +++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ;+++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` +++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++++. + ++++++++++++++++++ .,;+++++++++++++++++++++++++++++++++++++++++++++++++++++ .+++++++++++++. + ++++++++++++++++++ .,;++++++++++++++++++++++++++++++++++++++: +++++++++++++. + ++++++++++++++++++ .,+++++++++++++++++++++++++ +++++++++++++. + +++++++++++++++++. +++++++++++++++++++++++++ ,++++++++++++. + +++++++++++++++++ ;++++++++++++++++++++++++ ++++++++++++. + +++++++++++++++++ ,+++++++++++++++++++++++; ++++++++++++. + +++++++++++++++++ .+++++++++++++++++++++++, ++++++++++++. + +++++++++++++++++ .+++++++++++++++++++++++, ++++++++++++. + +++++++++++++++++ .+++++++++++++++++++++++, ++++++++++++. + +++++++++++++++++ :+++++++++++++++++++++++; ++++++++++++. + +++++++++++++++++` +++++++++++++++++++++++++ ++++++++++++. + +++++++++++++++++; +++++++++++++++++++++++++ ++++++++++++. + ++++++++++++++++++ +++++++++++++++++++++++++ ;++++++++++++. + ++++++++++++++++++ ,+++++++++++++++++++++++++ +++++++++++++. + ++++++++++++++++++: ++++++++++++++++++++++++++' +++++++++++++. + +++++++++++++++++++ +++++++++++++++++++++++++++ ;+++++++++++++. + +++++++++++++++++++, ++++++++++++++++++++++++++++, ++++++++++++++. + ++++++++++++++++++++ +++++++++++++++++++++++++++++ ;++++++++++++++. + ++++++++++++++++++++' ++++++++++++++++++++++++++++++' +++++++++++++++. + +++++++++++++++++++++, ++++++++++++++++++++++++++++++++ ++++++++++++++++. + ++++++++++++++++++++++ ;+++++++++++++++++++++++++++++++++ '++++++++++++++++. + +++++++++++++++++++++++ ;+++++++++++++++++++++++++++++++++++ :+++++++++++++++++. + ++++++++++++++++++++++++, '+++++++++++++++++++++++++++++++++++++ ;++++++++++++++++++. + +++++++++++++++++++++++++' ++++++++++++++++++++++++++++++++++++++++ ++++++++++++++++++++. + +++++++++++++++++++++++++++, '++++++++++++++++++++++++++++++++++++++++++' +++++++++++++++++++++. + +++++++++++++++++++++++++++++: '++++++++++++++++++++++++++++++++++++++++++++++, +++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++;` .++++++++++++++++++++++++++++++++++++++++++++++++++++' ,+++++++++++++++++++++++++. + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++',..,;+++++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + .+++++++++++++++++++++++++++++++++++++++++++++++++++++++: .,++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++: :+++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++, .++++++++++++++++++++++++++++++++++++++++++++++++++++++' + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++, + .++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' + ,+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + .++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++; + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` + :+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++` + ;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++, + .;+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++, + ,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:. + ..,;;+++++++++++++++++++++++++++++;:,. + + To submit the revised current.txt to the main CyanogenMod repository, + you will need approval. +****************************** \ No newline at end of file diff --git a/build/core/config.mk b/build/core/config.mk index e3b19487..2e90a6f9 100644 --- a/build/core/config.mk +++ b/build/core/config.mk @@ -22,6 +22,7 @@ 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_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 BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact_publish.mk