StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"

Browse Source
This commit is contained in:
Marius Renn
2012-03-27 16:29:47 -07:00
committed by Android (Google) Code Review
parent 361655591d fe97fe9e9f
commit e455a972be
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt.mk
View File

@@ -4,7 +4,7 @@
#################################### ####################################
# TODO: replace it with device's BOOTCLASSPATH # 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_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
DEXPREOPT_BUILD_DIR := $(OUT_DIR) DEXPREOPT_BUILD_DIR := $(OUT_DIR)

2
core/java.mk
View File

@@ -29,7 +29,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif endif
else else
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) 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
endif endif

3
core/pathmap.mk
View File

@@ -89,6 +89,9 @@ FRAMEWORKS_BASE_SUBDIRS := \
graphics \ graphics \
location \ location \
media \ media \
media/mca/effect \
media/mca/filterfw \
media/mca/filterpacks \
drm \ drm \
opengl \ opengl \
sax \ sax \

1
target/product/core.mk
View File

@@ -58,7 +58,6 @@ PRODUCT_PACKAGES := \
dmtracedump \ dmtracedump \
dx \ dx \
ext \ ext \
filterfw \
framework-res \ framework-res \
hprof-conv \ hprof-conv \
icu.dat \ icu.dat \