diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a0ec71d7a6..b4f6a263cb 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -32,15 +32,7 @@
       'webrtc_root%': '<(webrtc_root)',
 
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
-
-      # Enable opus for Chrome only right now.
-      'conditions': [
-        ['build_with_chromium==1', {
-          'include_opus%': 1,
-        }, {
-          'include_opus%': 0,
-        }],
-      ],
+      'include_opus%': 1,
     },
     'build_with_chromium%': '<(build_with_chromium)',
     'webrtc_root%': '<(webrtc_root)',
diff --git a/webrtc/video_engine/test/android/jni/Android.mk b/webrtc/video_engine/test/android/jni/Android.mk
index 4066609251..8cbba64f8f 100644
--- a/webrtc/video_engine/test/android/jni/Android.mk
+++ b/webrtc/video_engine/test/android/jni/Android.mk
@@ -120,6 +120,18 @@ LOCAL_SRC_FILES := \
     $(MY_LIBS_PATH)/webrtc/modules/libisac_neon.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libopus
+LOCAL_SRC_FILES := \
+    $(MY_LIBS_PATH)/third_party/opus/libopus.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libwebrtc_opus
+LOCAL_SRC_FILES := \
+    $(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := libvad
 LOCAL_SRC_FILES := \
@@ -292,6 +304,8 @@ LOCAL_STATIC_LIBRARIES := \
     libiLBC \
     libiSACFix \
     libisac_neon \
+    libwebrtc_opus \
+    libopus \
     libvad \
     libbitrate_controller \
     libresampler \