Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Side by Side Diff: webrtc/api/api.gyp

Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Changes to all.gyp Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « all.gyp ('k') | webrtc/api/api_java.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 ], 82 ],
83 'sources': [ 83 'sources': [
84 'java/jni/jni_onload.cc', 84 'java/jni/jni_onload.cc',
85 ], 85 ],
86 'variables': { 86 'variables': {
87 # This library uses native JNI exports; tell GYP so that the 87 # This library uses native JNI exports; tell GYP so that the
88 # required symbols will be kept. 88 # required symbols will be kept.
89 'use_native_jni_exports': 1, 89 'use_native_jni_exports': 1,
90 }, 90 },
91 }, 91 },
92 {
93 # |libjingle_peerconnection_java| builds a jar file with name
94 # libjingle_peerconnection_java.jar using Chrome's build system.
95 # It includes all Java files needed to setup a PeeerConnection call
96 # from Android.
97 'target_name': 'libjingle_peerconnection_java',
98 'type': 'none',
99 'dependencies': [
100 'libjingle_peerconnection_so',
101 ],
102 'variables': {
103 # Designate as Chromium code and point to our lint settings to
104 # enable linting of the WebRTC code (this is the only way to make
105 # lint_action invoke the Android linter).
106 'android_manifest_path': '<(webrtc_root)/build/android/AndroidManife st.xml',
107 'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml' ,
108 'chromium_code': 1,
109 'java_in_dir': 'java',
110 'webrtc_base_dir': '<(webrtc_root)/base',
111 'webrtc_modules_dir': '<(webrtc_root)/modules',
112 'additional_src_dirs' : [
113 'java/android',
114 '<(webrtc_base_dir)/java/src',
115 '<(webrtc_modules_dir)/audio_device/android/java/src',
116
117 ],
118 },
119 'includes': ['../../build/java.gypi'],
120 }, # libjingle_peerconnection_java
121 ] 92 ]
122 }], 93 }],
123 ], # conditions 94 ], # conditions
124 'targets': [ 95 'targets': [
125 { 96 {
126 'target_name': 'libjingle_peerconnection', 97 'target_name': 'libjingle_peerconnection',
127 'type': 'static_library', 98 'type': 'static_library',
128 'dependencies': [ 99 'dependencies': [
129 '<(webrtc_root)/media/media.gyp:rtc_media', 100 '<(webrtc_root)/media/media.gyp:rtc_media',
130 '<(webrtc_root)/pc/pc.gyp:rtc_pc', 101 '<(webrtc_root)/pc/pc.gyp:rtc_pc',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'quicdatatransport.h', 215 'quicdatatransport.h',
245 ], 216 ],
246 'export_dependent_settings': [ 217 'export_dependent_settings': [
247 '<(DEPTH)/third_party/libquic/libquic.gyp:libquic', 218 '<(DEPTH)/third_party/libquic/libquic.gyp:libquic',
248 ], 219 ],
249 }], 220 }],
250 ], 221 ],
251 }, # target libjingle_peerconnection 222 }, # target libjingle_peerconnection
252 ], # targets 223 ], # targets
253 } 224 }
OLDNEW
« no previous file with comments | « all.gyp ('k') | webrtc/api/api_java.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698