diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index e774ddbd13..a6a9e9f1d5 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -26,9 +26,11 @@
           ['build_with_chromium==1 or build_with_libjingle==1', {
             'webrtc_root%': '<(DEPTH)/third_party/webrtc',
             'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests.gyp',
+            'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp',
           }, {
             'webrtc_root%': '<(DEPTH)/webrtc',
             'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_test_noop.gyp',
+            'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp',
           }],
         ],
       },
@@ -36,6 +38,7 @@
       'build_with_libjingle%': '<(build_with_libjingle)',
       'webrtc_root%': '<(webrtc_root)',
       'apk_tests_path%': '<(apk_tests_path)',
+      'modules_java_gyp_path%': '<(modules_java_gyp_path)',
 
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
       'include_opus%': 1,
@@ -44,6 +47,7 @@
     'build_with_libjingle%': '<(build_with_libjingle)',
     'webrtc_root%': '<(webrtc_root)',
     'apk_tests_path%': '<(apk_tests_path)',
+    'modules_java_gyp_path%': '<(modules_java_gyp_path)',
     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
     'include_opus%': '<(include_opus)',
 
diff --git a/webrtc/modules/modules_java_chromium.gyp b/webrtc/modules/modules_java_chromium.gyp
new file mode 100644
index 0000000000..247a81d929
--- /dev/null
+++ b/webrtc/modules/modules_java_chromium.gyp
@@ -0,0 +1,39 @@
+# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'targets': [
+    {
+      'target_name': 'audio_device_module_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'audio_device/android/java',
+      },
+      'includes': [ '../../../build/java.gypi' ],
+    }, # audio_device_module_java
+    {
+      'target_name': 'video_capture_module_java',
+      'type': 'none',
+      'dependencies': [
+        'video_render_module_java',
+      ],
+      'variables': {
+        'java_in_dir': 'video_capture/android/java',
+      },
+      'includes': [ '../../../build/java.gypi' ],
+    }, # video_capture_module_java
+    {
+      'target_name': 'video_render_module_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': 'video_render/android/java',
+      },
+      'includes': [ '../../../build/java.gypi' ],
+    }, # video_render_module_java
+  ],
+}
diff --git a/webrtc/video_engine/test/android/android_video_demo.gypi b/webrtc/video_engine/test/android/android_video_demo.gypi
index b09d745092..3a5eae270f 100644
--- a/webrtc/video_engine/test/android/android_video_demo.gypi
+++ b/webrtc/video_engine/test/android/android_video_demo.gypi
@@ -89,7 +89,7 @@
       ],
       'dependencies': [
         '<(webrtc_root)/modules/modules.gyp:*',
-        '<(webrtc_root)/modules/modules_java.gyp:*',
+        '<(modules_java_gyp_path):*',
         '<(webrtc_root)/test/test.gyp:channel_transport',
         '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
         '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',