| OLD | NEW | 
|---|
| 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS.  All contributing project authors may | 6 # in the file PATENTS.  All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 # This file exists in two versions. A no-op version under | 9 # This file exists in two versions. A no-op version under | 
| 10 # webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk | 10 # webrtc/build/apk_tests_noop.gyp and this one. This gyp file builds the apk | 
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 232     }, | 232     }, | 
| 233     { | 233     { | 
| 234       # Used only by video_capture_tests_apk above, and impossible to use in the | 234       # Used only by video_capture_tests_apk above, and impossible to use in the | 
| 235       # standalone build, which is why it's declared here instead of under | 235       # standalone build, which is why it's declared here instead of under | 
| 236       # modules/video_capture/ (to avoid the need for a forked _noop.gyp file | 236       # modules/video_capture/ (to avoid the need for a forked _noop.gyp file | 
| 237       # like this file has; see comment at the top of this file). | 237       # like this file has; see comment at the top of this file). | 
| 238       'target_name': 'video_capture_java', | 238       'target_name': 'video_capture_java', | 
| 239       'type': 'none', | 239       'type': 'none', | 
| 240       'variables': { | 240       'variables': { | 
| 241         'java_in_dir': '<(webrtc_root)/modules/video_capture/android/java', | 241         'java_in_dir': '<(webrtc_root)/modules/video_capture/android/java', | 
|  | 242         'additional_src_dirs': [ '<(webrtc_root)/base/java/src', ], | 
| 242       }, | 243       }, | 
| 243       'includes': [ | 244       'includes': [ | 
| 244         '../../build/java.gypi', | 245         '../../build/java.gypi', | 
| 245       ], | 246       ], | 
| 246     }, | 247     }, | 
| 247     { | 248     { | 
| 248       'target_name': 'audio_device_java', | 249       'target_name': 'audio_device_java', | 
| 249       'type': 'none', | 250       'type': 'none', | 
| 250       'variables': { | 251       'variables': { | 
| 251         'java_in_dir': '<(webrtc_root)/modules/audio_device/android/java', | 252         'java_in_dir': '<(webrtc_root)/modules/audio_device/android/java', | 
|  | 253         'additional_src_dirs': [ '<(webrtc_root)/base/java/src', ], | 
| 252         'never_lint': 1, | 254         'never_lint': 1, | 
| 253       }, | 255       }, | 
| 254       'includes': [ | 256       'includes': [ | 
| 255         '../../build/java.gypi', | 257         '../../build/java.gypi', | 
| 256       ], | 258       ], | 
| 257     }, | 259     }, | 
| 258   ], | 260   ], | 
| 259 } | 261 } | 
| 260 | 262 | 
| 261 | 263 | 
| OLD | NEW | 
|---|