Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"
This commit is contained in:
commit
e455a972be
4 changed files with 5 additions and 3 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -89,6 +89,9 @@ FRAMEWORKS_BASE_SUBDIRS := \
|
|||
graphics \
|
||||
location \
|
||||
media \
|
||||
media/mca/effect \
|
||||
media/mca/filterfw \
|
||||
media/mca/filterpacks \
|
||||
drm \
|
||||
opengl \
|
||||
sax \
|
||||
|
|
|
@ -58,7 +58,6 @@ PRODUCT_PACKAGES := \
|
|||
dmtracedump \
|
||||
dx \
|
||||
ext \
|
||||
filterfw \
|
||||
framework-res \
|
||||
hprof-conv \
|
||||
icu.dat \
|
||||
|
|
Loading…
Reference in a new issue