commit 4eeb26c721ecd1f97a6dadaf724116d0b6e4920b
author Chong Zhang <chz@google.com> Thu Mar 28 21:08:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 28 21:08:26 2019 +0000
tree 169ec002b2d07a71070f043e0f9b2e53c8cb188f
parent 2cc6a2d21c20a604f0caa5f0f817251de8e7559a
parent d0fa5fb4c84c15e6eb30b11fc4213705b2bfe8a6

Merge "Remove the soft component sources from libstagefright_omx"

media/libstagefright/omx/Android.bp

diff --git a/media/libstagefright/omx/Android.bp b/media/libstagefright/omx/Android.bp
index b8f9aea..b959f6c 100644
--- a/media/libstagefright/omx/Android.bp
+++ b/media/libstagefright/omx/Android.bp
@@ -11,13 +11,6 @@
         "OMXNodeInstance.cpp",
         "OMXUtils.cpp",
         "OmxGraphicBufferSource.cpp",
-        //TODO: remove the soft component code here and use
-        //libstagefright_omx_soft, once partner build is fixed 
-        "SimpleSoftOMXComponent.cpp",
-        "SoftOMXComponent.cpp",
-        "SoftOMXPlugin.cpp",
-        "SoftVideoDecoderOMXComponent.cpp",
-        "SoftVideoEncoderOMXComponent.cpp",
         "1.0/Omx.cpp",
         "1.0/OmxStore.cpp",
         "1.0/WGraphicBufferSource.cpp",
@@ -58,7 +51,7 @@
         "libvndksupport",
         "android.hardware.media.omx@1.0",
         "android.hardware.graphics.bufferqueue@1.0",
-        //"libstagefright_omx_soft",
+        "libstagefright_omx_soft",
     ],
 
     export_shared_lib_headers: [