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

Side by Side Diff: webrtc/webrtc_examples.gyp

Issue 1430023005: Remove ICU usage from jni_helpers.cc. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Once more with feeling. Created 5 years, 1 month 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 | « webrtc/examples/android/media_demo/jni/jni_helpers.cc ('k') | no next file » | 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) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 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 'includes': ['build/common.gypi'], 9 'includes': ['build/common.gypi'],
10 'targets': [], 10 'targets': [],
11 'conditions': [ 11 'conditions': [
12 ['OS=="android"', { 12 ['OS=="android"', {
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'libwebrtcdemo-jni', 15 'target_name': 'libwebrtcdemo-jni',
16 'type': 'loadable_module', 16 'type': 'loadable_module',
17 'dependencies': [ 17 'dependencies': [
18 '<(webrtc_root)/common.gyp:webrtc_common', 18 '<(webrtc_root)/common.gyp:webrtc_common',
19 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l', 19 '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_imp l',
20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default', 20 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_ default',
21 '<(webrtc_root)/test/test.gyp:channel_transport', 21 '<(webrtc_root)/test/test.gyp:channel_transport',
22 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 22 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
23 ], 23 ],
24 'sources': [ 24 'sources': [
25 'examples/android/media_demo/jni/jni_helpers.cc', 25 'examples/android/media_demo/jni/jni_helpers.cc',
26 'examples/android/media_demo/jni/on_load.cc', 26 'examples/android/media_demo/jni/on_load.cc',
27 'examples/android/media_demo/jni/voice_engine_jni.cc', 27 'examples/android/media_demo/jni/voice_engine_jni.cc',
28 ], 28 ],
29 'conditions': [
30 ['build_icu==1', {
31 'dependencies': [
32 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
33 ],
34 }],
35 ],
36 'variables': { 29 'variables': {
37 # This library uses native JNI exports; tell GYP so that the 30 # This library uses native JNI exports; tell GYP so that the
38 # required symbols will be kept. 31 # required symbols will be kept.
39 'use_native_jni_exports': 1, 32 'use_native_jni_exports': 1,
40 }, 33 },
41 'link_settings': { 34 'link_settings': {
42 'libraries': [ 35 'libraries': [
43 '-llog', 36 '-llog',
44 '-lGLESv2', 37 '-lGLESv2',
45 '-lOpenSLES', 38 '-lOpenSLES',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 'cd - > /dev/null && ' 80 'cd - > /dev/null && '
88 'cp <(android_webrtc_demo_root)/bin/WebRTCDemo-debug.apk <(_outp uts)' 81 'cp <(android_webrtc_demo_root)/bin/WebRTCDemo-debug.apk <(_outp uts)'
89 ], 82 ],
90 }, 83 },
91 ], 84 ],
92 }, 85 },
93 ], 86 ],
94 }], 87 }],
95 ], 88 ],
96 } 89 }
OLDNEW
« no previous file with comments | « webrtc/examples/android/media_demo/jni/jni_helpers.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698