commit 706e8765fb5809e6814f156981de45675e88fbad
author Andy Hung <hunga@google.com> Thu Dec 13 21:31:45 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 13 21:31:45 2018 +0000
tree 2293f4394b537e31d881ecaf7ab8d0ea0aab5a4c
parent c656c8df182f2b7a1ad0d692ad7730e9c3c4c293
parent 9983bcb0df778aed9e09a3c721b87f480c1c9034

Merge "resolve merge conflicts of 0c102d404d7f152b7d05433732ef4d1efeac533d to master"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index eee26ae..449d29c 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -21,7 +21,9 @@
         "libamrextractor",
         "libflacextractor",
         "libmidiextractor",
+        "libmkvextractor",
         "libmp3extractor",
+        "libmp4extractor",
         "libwavextractor",
     ],
     key: "com.android.media.key",

services/mediaextractor/Android.mk

diff --git a/services/mediaextractor/Android.mk b/services/mediaextractor/Android.mk
index 7c9c727..dddd960 100644
--- a/services/mediaextractor/Android.mk
+++ b/services/mediaextractor/Android.mk
@@ -40,8 +40,6 @@
 
 # extractor libraries
 LOCAL_REQUIRED_MODULES += \
-    libmkvextractor \
-    libmp4extractor \
     libmpeg2extractor \
     liboggextractor \