Multi-Project Commit: Move of filterfw out of system/media (3 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: I3d12882239e0bb66e11d3fb5ec952cc474be4f0a

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index b801ac2..38982c0 100644 (file)
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -4,7 +4,7 @@
 ####################################
 
 # TODO: replace it with device's BOOTCLASSPATH
-DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:android.policy:services:apache-xml:filterfw
+DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:android.policy:services:apache-xml
 DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
 
 DEXPREOPT_BUILD_DIR := $(OUT_DIR)

diff --git a/core/java.mk b/core/java.mk
index 38fd6f2..eff2465 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -29,7 +29,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
   endif
 else
   ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
-    LOCAL_JAVA_LIBRARIES := core core-junit ext framework filterfw $(LOCAL_JAVA_LIBRARIES)
+    LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES)
   endif
 endif
 

diff --git a/core/pathmap.mk b/core/pathmap.mk
index 235f775..672fcec 100644 (file)
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -89,6 +89,9 @@ FRAMEWORKS_BASE_SUBDIRS := \
            graphics \
            location \
            media \
+           media/mca/effect \
+           media/mca/filterfw \
+           media/mca/filterpacks \
            drm \
            opengl \
            sax \

diff --git a/target/product/core.mk b/target/product/core.mk
index f655904..8f6b0e7 100644 (file)
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -58,7 +58,6 @@ PRODUCT_PACKAGES := \
     dmtracedump \
     dx \
     ext \
-    filterfw \
     framework-res \
     hprof-conv \
     icu.dat \