Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e455a972 authored by Marius Renn's avatar Marius Renn Committed by Android (Google) Code Review
Browse files

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

parents 36165559 fe97fe9e

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/pathmap.mk

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ FRAMEWORKS_BASE_SUBDIRS := \ 
	    graphics \

	    location \

	    media \

	    media/mca/effect \

	    media/mca/filterfw \

	    media/mca/filterpacks \

	    drm \

	    opengl \

	    sax \

target/product/core.mk

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ PRODUCT_PACKAGES := \ 
    dmtracedump \

    dx \

    ext \

    filterfw \

    framework-res \

    hprof-conv \

    icu.dat \