Separate building and enabling libevent.

webrtc/build/common.gypi

Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 4006d1745aabc7526b5ee111672d9220274765c3..fd9252655bf295394e6f232c037d813d6a6813e8 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -19,9 +19,7 @@
 
           # Enable to use the Mozilla internal settings.
           'build_with_mozilla%': 0,
-          'build_for%': '',
         },
-        'build_for%': '<(build_for)',
         'build_with_chromium%': '<(build_with_chromium)',
         'build_with_mozilla%': '<(build_with_mozilla%)',
         'include_opus%': 1,
@@ -45,18 +43,18 @@
           }],
 
           # Controls whether we use libevent on posix platforms.
-          # TODO(tommi): Remove the 'build_for' condition once libevent is more
-          # widely available in posix configurations.
-          ['OS=="win" or OS=="mac" or OS=="ios" or build_for!=""', {
-            'build_libevent%': 0,
+          # TODO(phoglund): should arguably be controlled by platform #ifdefs
+          # in the code instead.
+          ['OS=="win" or OS=="mac" or OS=="ios"', {
+            'enable_libevent%': 0,
           }, {
-            'build_libevent%': 1,
+            'enable_libevent%': 1,
           }],
         ],
       },
       'build_with_chromium%': '<(build_with_chromium)',
       'build_with_mozilla%': '<(build_with_mozilla)',
-      'build_libevent%': '<(build_libevent)',
+      'enable_libevent%': '<(enable_libevent)',
       'webrtc_root%': '<(webrtc_root)',
       'apk_tests_path%': '<(apk_tests_path)',
       'modules_java_gyp_path%': '<(modules_java_gyp_path)',
@@ -68,7 +66,7 @@
     },
     'build_with_chromium%': '<(build_with_chromium)',
     'build_with_mozilla%': '<(build_with_mozilla)',
-    'build_libevent%': '<(build_libevent)',
+    'enable_libevent%': '<(enable_libevent)',
     'webrtc_root%': '<(webrtc_root)',
     'apk_tests_path%': '<(apk_tests_path)',
     'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
@@ -111,6 +109,7 @@
 
     # Disable these to not build components which can be externally provided.
     'build_expat%': 1,
+    'build_libevent%': 1,
     'build_json%': 1,
     'build_libjpeg%': 1,
     'build_libsrtp%': 1,
@@ -332,7 +331,7 @@
           }],
         ],
       }],
-      ['build_libevent==1', {
+      ['enable_libevent==1', {
         'defines': [
           'WEBRTC_BUILD_LIBEVENT',
         ],