summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorMarius Renn <renn@google.com>2012-03-27 10:44:45 -0700
committerMarius Renn <renn@google.com>2012-03-27 10:44:45 -0700
commit65953da4636fbf5f0a24b8f5f2b5fa7d76ff13d9 (patch)
treebfb7ea73b90f23cd135b68b090a72ef8b947ee90 /Android.mk
parent80e4ee46008d2817dc0496e0cf8c9470c6851755 (diff)
downloadframeworks_base-65953da4636fbf5f0a24b8f5f2b5fa7d76ff13d9.zip
frameworks_base-65953da4636fbf5f0a24b8f5f2b5fa7d76ff13d9.tar.gz
frameworks_base-65953da4636fbf5f0a24b8f5f2b5fa7d76ff13d9.tar.bz2
Multi-Project Commit: Move of filterfw out of system/media (2 of 7)
This is part of the multi-project commit to move the filter-framework from system/media/mca to frameworks/base/media/mca. Note that the filter-framework will soon be replaced with a refactored version currently under API review (also to go under frameworks/base). This move is done now to unblock the PDK efforts. Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 5572c50..15a4196 100644
--- a/Android.mk
+++ b/Android.mk
@@ -324,9 +324,6 @@ fwbase_dirs_to_document := \
# include definition of libcore_to_document
include $(LOCAL_PATH)/../../libcore/Docs.mk
-# include definition of libfilterfw_to_document
-include $(LOCAL_PATH)/../../system/media/mca/Docs.mk
-
non_base_dirs := \
../../external/apache-http/src/org/apache/http
@@ -349,8 +346,7 @@ 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 ../../system/media/mca/, $(call libfilterfw_to_document, $(LOCAL_PATH)/../../system/media/mca)) \
+ $(addprefix ../../libcore/, $(call libcore_to_document, $(LOCAL_PATH)/../../libcore))
# These are relative to frameworks/base
framework_docs_LOCAL_SRC_FILES := \