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

am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."

Browse Source 
* commit 'b33fe50a634e4fde635f7e662526db1c3e2cfa5c':
  libcore_to_document and junit_to_document are no longer functions.
This commit is contained in:
Ying Wang
2013-12-05 17:56:45 +00:00
committed by Android Git Automerger
parent 4a657244b3 b33fe50a63
commit ceddb389b4
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

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

4
tests/TileBenchmark/Android.mk
View File

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