summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-12-04 16:01:06 -0800
committerYing Wang <wangying@google.com>2013-12-04 16:01:06 -0800
commitc79d6a9bd6de724ec2357537ce8655f1845d481d (patch)
treed4465edd1e4a295ae49ffb81501ee15dc7632b95
parentc3c4d36df01631883a79163da841ca222497c9d3 (diff)
downloadframeworks_base-c79d6a9bd6de724ec2357537ce8655f1845d481d.zip
frameworks_base-c79d6a9bd6de724ec2357537ce8655f1845d481d.tar.gz
frameworks_base-c79d6a9bd6de724ec2357537ce8655f1845d481d.tar.bz2
libcore_to_document and junit_to_document are no longer functions.
They are evaluated only once in the corresponding export .mk file. This fixes build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: I549eb052272bbdebef8fca697822f5eaa0fe5764
-rw-r--r--Android.mk4
-rw-r--r--tests/TileBenchmark/Android.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 5af0231..8fcac91 100644
--- a/Android.mk
+++ b/Android.mk
@@ -469,8 +469,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 := \
diff --git a/tests/TileBenchmark/Android.mk b/tests/TileBenchmark/Android.mk
index 5851113..9a057af 100644
--- a/tests/TileBenchmark/Android.mk
+++ b/tests/TileBenchmark/Android.mk
@@ -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) \ No newline at end of file
+include $(BUILD_PACKAGE)