commit 156082a18c9186359d2a6bf434d76c338c8db43f
author Dongwon Kang <dwkang@google.com> Thu Dec 13 00:53:01 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 13 00:53:01 2018 +0000
tree 80f54757c3d57f1381848e13d0ad9259fd43f62a
parent 7c5bd0396a8246299051e95d6dc96d0e226061d1
parent f652118da25973feedf3593f50a0854d97e951bd

Merge "Move WAV/FLAC/MIDI/AAC/MP3/AMR extractors to APEX"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 575603f..eee26ae 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,14 +21,8 @@
         "libamrextractor",
         "libflacextractor",
         "libmidiextractor",
-        "libmkvextractor",
         "libmp3extractor",
-        "libmp4extractor",
-        "libmpeg2extractor",
-        "liboggextractor",
         "libwavextractor",
-        // MediaPlayer2
-        "libmedia2_jni",
     ],
     key: "com.android.media.key",
 }

services/mediaextractor/Android.mk

diff --git a/services/mediaextractor/Android.mk b/services/mediaextractor/Android.mk
index 19ce7e9..7c9c727 100644
--- a/services/mediaextractor/Android.mk
+++ b/services/mediaextractor/Android.mk
@@ -40,16 +40,10 @@
 
 # extractor libraries
 LOCAL_REQUIRED_MODULES += \
-    libaacextractor \
-    libamrextractor \
-    libflacextractor \
-    libmidiextractor \
     libmkvextractor \
-    libmp3extractor \
     libmp4extractor \
     libmpeg2extractor \
     liboggextractor \
-    libwavextractor \
 
 LOCAL_SRC_FILES := main_extractorservice.cpp
 LOCAL_SHARED_LIBRARIES := libmedia libmediaextractorservice libbinder libutils \