Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "libcore_to_document and junit_to_document are no longer functions."

Browse Source
This commit is contained in:
Ying Wang
2013-12-05 17:39:59 +00:00
committed by Gerrit Code Review
parent 8026b2ce23 50a0fd50f7
commit dcbde1b02a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@@ -457,8 +457,8 @@ html_dirs := \
# Common sources for doc check and api check
common_src_files := \
$(call find-other-html-files, $(html_dirs)) \
$(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore)) \
$(addprefix ../../external/junit/, $(call junit_to_document, $(LOCAL_PATH)/../../external/junit))
$(addprefix ../../libcore/, $(libcore_to_document)) \
$(addprefix ../../external/junit/, $(junit_to_document))
# These are relative to frameworks/base
framework_docs_LOCAL_SRC_FILES := \

4
tests/TileBenchmark/Android.mk
View File

@@ -17,7 +17,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES :=
LOCAL_PACKAGE_NAME := TileBenchmark
@@ -25,4 +25,4 @@ LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)