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

Side by Side Diff: talk/build/common.gypi

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/app/webrtc/java/jni/jni_helpers.cc ('k') | talk/libjingle.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 # 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 23 matching lines...) Expand all
34 # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a 34 # TODO(ronghuawu): For now, disable the Chrome plugins, which causes a
35 # flood of chromium-style warnings. 35 # flood of chromium-style warnings.
36 'clang_use_chrome_plugins%': 0, 36 'clang_use_chrome_plugins%': 0,
37 'conditions': [ 37 'conditions': [
38 ['OS=="android" or OS=="linux"', { 38 ['OS=="android" or OS=="linux"', {
39 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/ usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'i nclude/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a direct ory containing include/jni.h!\'; print dir")', 39 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/ usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'i nclude/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a direct ory containing include/jni.h!\'; print dir")',
40 }], 40 }],
41 ], 41 ],
42 # Disable these to not build components which can be externally provided. 42 # Disable these to not build components which can be externally provided.
43 'build_expat%': 1, 43 'build_expat%': 1,
44 'build_icu%': 1,
45 'build_json%': 1, 44 'build_json%': 1,
46 'build_libsrtp%': 1, 45 'build_libsrtp%': 1,
47 'build_libyuv%': 1, 46 'build_libyuv%': 1,
48 'build_usrsctp%': 1, 47 'build_usrsctp%': 1,
49 # Make it possible to provide custom locations for some libraries. 48 # Make it possible to provide custom locations for some libraries.
50 'libyuv_dir%': '<(DEPTH)/third_party/libyuv', 49 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
51 50
52 # Disable this to skip building source requiring GTK. 51 # Disable this to skip building source requiring GTK.
53 'use_gtk%': 1, 52 'use_gtk%': 1,
54 }, 53 },
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 'HASH_NAMESPACE=__gnu_cxx', 153 'HASH_NAMESPACE=__gnu_cxx',
155 'WEBRTC_POSIX', 154 'WEBRTC_POSIX',
156 'DISABLE_DYNAMIC_CAST', 155 'DISABLE_DYNAMIC_CAST',
157 # The POSIX standard says we have to define this. 156 # The POSIX standard says we have to define this.
158 '_REENTRANT', 157 '_REENTRANT',
159 ], 158 ],
160 }], 159 }],
161 ], 160 ],
162 }, # target_defaults 161 }, # target_defaults
163 } 162 }
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/jni_helpers.cc ('k') | talk/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698