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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle.gyp

Issue 17647002: Fix check_perms for r208246 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/finalize_apk_action.gypi ('k') | third_party/libjingle/overrides/allocator_shim/allocator_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle.gyp
===================================================================
--- third_party/libjingle/libjingle.gyp (revision 208299)
+++ third_party/libjingle/libjingle.gyp (working copy)
@@ -898,13 +898,12 @@
'libjingle_webrtc_common',
],
'conditions': [
- ['libpeer_allocator_shim==1 and '
- 'libpeer_target_type!="static_library"', {
+ ['libpeer_target_type!="static_library"', {
'sources': [
'overrides/initialize_module.cc',
],
'conditions': [
- ['OS!="mac"', {
+ ['OS!="mac" and OS!="android"', {
'sources': [
'overrides/allocator_shim/allocator_proxy.cc',
],
@@ -936,7 +935,7 @@
['OS=="mac" and libpeer_target_type!="static_library"', {
'product_name': 'libpeerconnection',
}],
- ['OS=="android"', {
+ ['OS=="android" and "<(libpeer_target_type)"=="static_library"', {
'standalone_static_library': 1,
}],
['OS=="linux" and libpeer_target_type!="static_library"', {
« no previous file with comments | « build/android/finalize_apk_action.gypi ('k') | third_party/libjingle/overrides/allocator_shim/allocator_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698