StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use doclava for apicheck

Browse Source 
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
This commit is contained in:
Ben Dodson
2010-08-10 16:01:23 -07:00
parent 7cf1214093
commit 83019ba39c
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/tasks/apicheck.mk
View File

@@ -19,6 +19,10 @@
ifneq ($(BUILD_TINY_ANDROID), true) ifneq ($(BUILD_TINY_ANDROID), true)
APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)
APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX)
.PHONY: checkapi .PHONY: checkapi
# eval this to define a rule that runs apicheck. # eval this to define a rule that runs apicheck.
@@ -32,7 +36,7 @@ ifneq ($(BUILD_TINY_ANDROID), true)
define check-api define check-api
$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp: $(2) $(3) $(APICHECK) $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp: $(2) $(3) $(APICHECK)
@echo "Checking API:" $(1) @echo "Checking API:" $(1)
$(hide) ( $(APICHECK) $(4) $(2) $(3) || ( $(5) ; exit 38 ) ) $(hide) ( $(APICHECK) -J"classpath $(APICHECK_CLASSPATH)" $(4) $(2) $(3) || ( $(5) ; exit 38 ) )
$(hide) mkdir -p $$(dir $$@) $(hide) mkdir -p $$(dir $$@)
$(hide) touch $$@ $(hide) touch $$@
checkapi: $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp checkapi: $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/$(strip $(1))-timestamp

2
tools/apicheck/Android.mk
View File

@@ -29,7 +29,7 @@ LOCAL_MODULE := apicheck
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/apicheck$(COMMON_JAVA_PACKAGE_SUFFIX) $(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/apicheck | $(ACP) $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/apicheck | $(ACP)
@echo "Copy: $(PRIVATE_MODULE) ($@)" @echo "Copy: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-new-target) $(copy-file-to-new-target)

8
tools/apicheck/etc/apicheck
View File

@@ -16,6 +16,10 @@
# Set up prog to be the path of this script, including following symlinks, # Set up prog to be the path of this script, including following symlinks,
# and set up progdir to be the fully-qualified pathname of its directory. # and set up progdir to be the fully-qualified pathname of its directory.
#
# The classpath and other java options used in apicheck are specified in
# build/core/tasks/apicheck.mk.
prog="$0" prog="$0"
while [ -h "${prog}" ]; do while [ -h "${prog}" ]; do
newProg=`/bin/ls -ld "${prog}"` newProg=`/bin/ls -ld "${prog}"`
@@ -34,8 +38,6 @@ progdir=`pwd`
prog="${progdir}"/`basename "${prog}"` prog="${progdir}"/`basename "${prog}"`
cd "${oldwd}" cd "${oldwd}"
libdir=`dirname $progdir`/framework
javaOpts="" javaOpts=""
while expr "x$1" : 'x-J' >/dev/null; do while expr "x$1" : 'x-J' >/dev/null; do
opt=`expr "x$1" : 'x-J\(.*\)'` opt=`expr "x$1" : 'x-J\(.*\)'`
@@ -43,4 +45,4 @@ while expr "x$1" : 'x-J' >/dev/null; do
shift shift
done done
exec java $javaOpts -jar $libdir/apicheck.jar "$@" exec java $javaOpts com.google.doclava.apicheck.ApiCheck "$@"