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

Side by Side Diff: talk/libjingle.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 | « talk/build/common.gypi ('k') | webrtc/build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 'app/webrtc/java/jni/jni_helpers.cc', 55 'app/webrtc/java/jni/jni_helpers.cc',
56 'app/webrtc/java/jni/jni_helpers.h', 56 'app/webrtc/java/jni/jni_helpers.h',
57 'app/webrtc/java/jni/native_handle_impl.cc', 57 'app/webrtc/java/jni/native_handle_impl.cc',
58 'app/webrtc/java/jni/native_handle_impl.h', 58 'app/webrtc/java/jni/native_handle_impl.h',
59 'app/webrtc/java/jni/peerconnection_jni.cc', 59 'app/webrtc/java/jni/peerconnection_jni.cc',
60 ], 60 ],
61 'include_dirs': [ 61 'include_dirs': [
62 '<(libyuv_dir)/include', 62 '<(libyuv_dir)/include',
63 ], 63 ],
64 'conditions': [ 64 'conditions': [
65 ['build_icu==1', {
66 'dependencies': [
67 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
68 ],
69 }],
70 ['OS=="linux"', { 65 ['OS=="linux"', {
71 'defines': [ 66 'defines': [
72 'HAVE_GTK', 67 'HAVE_GTK',
73 ], 68 ],
74 'include_dirs': [ 69 'include_dirs': [
75 '<(java_home)/include', 70 '<(java_home)/include',
76 '<(java_home)/include/linux', 71 '<(java_home)/include/linux',
77 ], 72 ],
78 'conditions': [ 73 'conditions': [
79 ['use_gtk==1', { 74 ['use_gtk==1', {
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 ['OS=="android" and build_with_chromium==0', { 788 ['OS=="android" and build_with_chromium==0', {
794 'sources': [ 789 'sources': [
795 'app/webrtc/androidvideocapturer.h', 790 'app/webrtc/androidvideocapturer.h',
796 'app/webrtc/androidvideocapturer.cc', 791 'app/webrtc/androidvideocapturer.cc',
797 ], 792 ],
798 }], 793 }],
799 ], 794 ],
800 }, # target libjingle_peerconnection 795 }, # target libjingle_peerconnection
801 ], 796 ],
802 } 797 }
OLDNEW
« no previous file with comments | « talk/build/common.gypi ('k') | webrtc/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698