p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Current.xml and friends are now .txt instead. 

(and much much easier to read)

Change-Id: I31832069d4fd78a937802aa20d0b0861bf99768c
This commit is contained in:
Joe Onorato 2011-04-08 15:03:48 -07:00
parent a56cf6adf0
commit 15ee93bf95
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/apicheck_msg_current.txt
View File

@ -6,10 +6,10 @@ 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.xml by executing the following command:
2) You can update current.txt by executing the following command:
make update-api
To submit the revised current.xml to the main Android repository,
To submit the revised current.txt to the main Android repository,
you will need approval.
******************************

2
core/config.mk
View File

@ -349,7 +349,7 @@ TARGET_AVAILABLE_NDK_VERSIONS := $(call numerically_sort,\
$(patsubst $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r%,%, \
$(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r*)))
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.txt
# This is the standard way to name a directory containing prebuilt target
# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so

21
core/tasks/apicheck.mk
View File

@ -29,8 +29,8 @@ APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(
#
# Args:
# $(1) target
# $(2) stable api xml file
# $(3) api xml file to be tested
# $(2) stable api file
# $(3) api file to be tested
# $(4) arguments for apicheck
# $(5) command to run if apicheck failed
define check-api
@ -45,10 +45,11 @@ endef
# Run the checkapi rules by default.
droidcore: checkapi
last_released_sdk_version := $(lastword $(call numerically_sort,\
$(patsubst $(SRC_API_DIR)/%.xml,%, \
$(filter-out $(SRC_API_DIR)/current.xml, \
$(wildcard $(SRC_API_DIR)/*.xml)))))
last_released_sdk_version := $(lastword $(call numerically_sort, \
$(filter-out $(SRC_API_DIR)/current, \
$(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \
)\
))
# INTERNAL_PLATFORM_API_FILE is the one build by droiddoc.
@ -56,7 +57,7 @@ last_released_sdk_version := $(lastword $(call numerically_sort,\
# SDK version.
$(eval $(call check-api, \
checkapi-last, \
$(SRC_API_DIR)/$(last_released_sdk_version).xml, \
$(SRC_API_DIR)/$(last_released_sdk_version).txt, \
$(INTERNAL_PLATFORM_API_FILE), \
-hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 \
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
@ -68,7 +69,7 @@ $(eval $(call check-api, \
# SDK version.
$(eval $(call check-api, \
checkapi-current, \
$(SRC_API_DIR)/current.xml, \
$(SRC_API_DIR)/current.txt, \
$(INTERNAL_PLATFORM_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 \
@ -79,7 +80,7 @@ $(eval $(call check-api, \
.PHONY: update-api
update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP)
@echo Copying current.xml
$(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.xml
@echo Copying current.txt
$(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.txt
endif