Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
@@ skipping 378 matching lines @@
       "filters/decrypting_audio_decoder.h",
       "filters/decrypting_video_decoder.cc",
       "filters/decrypting_video_decoder.h",
     ]
     deps += [
       "//media/base/android",
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
 
-    # Only 64 bit builds are using android-21 NDK library, check common.gypi
-    if (current_cpu == "arm64" || current_cpu == "x64" ||
-        current_cpu == "mips64el") {
-      sources += [
-        "base/android/ndk_media_codec_bridge.cc",
-        "base/android/ndk_media_codec_bridge.h",
-      ]
-      libs += [ "mediandk" ]
-    }
     allow_circular_includes_from = [ "//media/base/android" ]
   }
 
   if (!is_android || media_use_ffmpeg) {
     sources += [
       "filters/opus_audio_decoder.cc",
       "filters/opus_audio_decoder.h",
     ]
   }
 
@@ skipping 474 matching lines @@
       "//media/base:test_support",
       "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx:test_support",
       "//ui/gfx/geometry",
     ]
   }
 }