diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 7eae646985..36a2daedf0 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -35,11 +35,9 @@ ['build_with_chromium==1', { 'webrtc_root%': '<(DEPTH)/third_party/webrtc', 'android_tests_path%': '<(DEPTH)/third_party/webrtc/build/android_tests_noop.gyp', - 'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp', }, { 'webrtc_root%': '<(DEPTH)/webrtc', 'android_tests_path%': '<(DEPTH)/webrtc/build/android_tests.gyp', - 'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp', }], # Controls whether we use libevent on posix platforms. @@ -60,7 +58,6 @@ 'enable_libevent%': '<(enable_libevent)', 'webrtc_root%': '<(webrtc_root)', 'android_tests_path%': '<(android_tests_path)', - 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8', 'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9', 'include_ilbc%': '<(include_ilbc)', @@ -74,7 +71,6 @@ 'webrtc_root%': '<(webrtc_root)', 'android_tests_path%': '<(android_tests_path)', 'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py', - 'modules_java_gyp_path%': '<(modules_java_gyp_path)', 'webrtc_vp8_dir%': '<(webrtc_vp8_dir)', 'webrtc_vp9_dir%': '<(webrtc_vp9_dir)', 'include_ilbc%': '<(include_ilbc)', diff --git a/webrtc/modules/modules_java.gyp b/webrtc/modules/modules_java.gyp deleted file mode 100644 index 2a72fb30a4..0000000000 --- a/webrtc/modules/modules_java.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# 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', - 'additional_src_dirs': [ '../base/java/src', ], - }, - - 'includes': [ '../../build/java.gypi' ], - }, # audio_device_module_java - ], -} diff --git a/webrtc/modules/modules_java_chromium.gyp b/webrtc/modules/modules_java_chromium.gyp deleted file mode 100644 index ebc53d60ff..0000000000 --- a/webrtc/modules/modules_java_chromium.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# 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 - ], -}