From 42581545ebf930b4339c6a94d70da8cc731b66cd Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Tue, 16 Jul 2013 16:37:22 +0000 Subject: [PATCH] Fixes: Resolves conflict that will happen when merging libjingle's and WebRTC's supplemental.gyp. By separating build_with_chromium and build_with_libjingle one can now just define build_with_libjingle in libjingle's supplemental.gyp. Once that is done it will be possible to merge the two supplemental.gyp-files. I.e. in WebRTC the supplemental.gyp would only set build_with_chromium to 0 since there is no longer any reason to disable logging and tests as they will be accessible in the same repository as libjingle. Libjingle sets the variables here: https://code.google.com/p/libjingle/source/browse/trunk/talk/supplement.gypi BUG=N/A R=andrew@webrtc.org, fischman@webrtc.org, wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1787005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4354 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/common.gypi | 39 ++++++++++--------- .../source/system_wrappers.gyp | 2 +- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi index 4e439e6bb..5572b2ae5 100644 --- a/webrtc/build/common.gypi +++ b/webrtc/build/common.gypi @@ -17,17 +17,17 @@ # This will be set to zero in the supplement.gypi triggered by a # gclient hook in the standalone build. 'build_with_chromium%': 1, - 'build_with_libjingle%': 0, }, 'build_with_chromium%': '<(build_with_chromium)', - 'build_with_libjingle%': '<(build_with_libjingle)', 'conditions': [ - ['build_with_chromium==1 or build_with_libjingle==1', { + ['build_with_chromium==1', { + 'build_with_libjingle': 1, 'webrtc_root%': '<(DEPTH)/third_party/webrtc', 'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests.gyp', 'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp', }, { + 'build_with_libjingle%': 0, 'webrtc_root%': '<(DEPTH)/webrtc', 'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_test_noop.gyp', 'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp', @@ -94,6 +94,9 @@ 'conditions': [ ['build_with_chromium==1', { + # clang_use_chrome_plugins must not be disabled when building Chromium. + 'clang_use_chrome_plugins': 1, + # Exclude pulse audio on Chromium since its prerequisites don't require # pulse audio. 'include_pulse_audio%': 0, @@ -107,24 +110,27 @@ # Exclude internal video render module in Chromium build. 'include_internal_video_render%': 0, - 'include_tests%': 0, - - 'enable_tracing%': 0, - - 'enable_android_opensl%': 0, + # Include ndk cpu features in Chromium build. + 'include_ndk_cpu_features%': 1, }, { # Settings for the standalone (not-in-Chromium) build. - 'include_pulse_audio%': 1, - 'include_internal_audio_device%': 1, - 'include_internal_video_capture%': 1, - 'include_internal_video_render%': 1, - 'enable_tracing%': 1, - 'include_tests%': 1, - # TODO(andrew): For now, disable the Chrome plugins, which causes a # flood of chromium-style warnings. Investigate enabling them: # http://code.google.com/p/webrtc/issues/detail?id=163 'clang_use_chrome_plugins%': 0, + 'include_pulse_audio%': 1, + 'include_internal_audio_device%': 1, + 'include_internal_video_capture%': 1, + 'include_internal_video_render%': 1, + 'include_ndk_cpu_features%': 0, + }], + ['build_with_libjingle==1', { + 'include_tests%': 0, + 'enable_tracing%': 0, + 'enable_android_opensl%': 0, + }, { + 'include_tests%': 1, + 'enable_tracing%': 1, # Switch between Android audio device OpenSL ES implementation # and Java Implementation 'enable_android_opensl%': 0, @@ -137,9 +143,6 @@ 'build_libvpx%': 0, 'include_tests%': 0, }], - ['build_with_libjingle==1', { - 'include_tests%': 0, - }], ['target_arch=="arm"', { 'prefer_fixed_point%': 1, }], diff --git a/webrtc/system_wrappers/source/system_wrappers.gyp b/webrtc/system_wrappers/source/system_wrappers.gyp index 36e003dbd..38eceac7a 100644 --- a/webrtc/system_wrappers/source/system_wrappers.gyp +++ b/webrtc/system_wrappers/source/system_wrappers.gyp @@ -211,7 +211,7 @@ 'cpu_features_android.c', ], 'conditions': [ - ['build_with_chromium==1', { + ['include_ndk_cpu_features==1', { 'conditions': [ ['android_webview_build == 1', { 'libraries': [