diff options
| author | Marius Renn <renn@google.com> | 2012-03-27 10:46:13 -0700 |
|---|---|---|
| committer | Marius Renn <renn@google.com> | 2012-03-27 10:46:13 -0700 |
| commit | fe97fe9e9f57224ea29e67ad9e367241ac8f10b8 (patch) | |
| tree | f6f11394ff164a93c179a2fbe1170db1874997a4 | |
| parent | 9bf081e910eae44c0a6a1342881f04a2cf4dc36b (diff) | |
| download | build-fe97fe9e9f57224ea29e67ad9e367241ac8f10b8.zip build-fe97fe9e9f57224ea29e67ad9e367241ac8f10b8.tar.gz build-fe97fe9e9f57224ea29e67ad9e367241ac8f10b8.tar.bz2 | |
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
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 2 | ||||
| -rw-r--r-- | core/pathmap.mk | 3 | ||||
| -rw-r--r-- | target/product/core.mk | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index b801ac2..38982c0 100644 --- 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 --- 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 --- 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 --- 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 \ |