Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / build / common.gypi

diff --git a/src/third_party/webrtc/build/common.gypi b/src/third_party/webrtc/build/common.gypi
index fdf1abe..6c3cc7b 100644 (file)
--- a/src/third_party/webrtc/build/common.gypi
+++ b/src/third_party/webrtc/build/common.gypi
@@ -42,6 +42,7 @@
       'modules_java_gyp_path%': '<(modules_java_gyp_path)',
       'gen_core_neon_offsets_gyp%': '<(gen_core_neon_offsets_gyp)',
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
+      'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
       'rbe_components_path%': '<(webrtc_root)/modules/remote_bitrate_estimator',
       'include_opus%': 1,
     },
@@ -52,6 +53,7 @@
     'modules_java_gyp_path%': '<(modules_java_gyp_path)',
     'gen_core_neon_offsets_gyp%': '<(gen_core_neon_offsets_gyp)',
     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
+    'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
     'include_opus%': '<(include_opus)',
     'rtc_relative_path%': 1,
     'rbe_components_path%': '<(rbe_components_path)',
@@ -108,7 +110,6 @@
 
     # Define MIPS architecture variant, MIPS DSP variant and MIPS FPU
     # This may be subject to change in accordance to Chromium's MIPS flags
-    'mips_arch_variant%': 'mips32r1',
     'mips_dsp_rev%': 0,
     'mips_fpu%' : 1,
     'enable_android_opensl%': 1,
@@ -155,6 +156,11 @@
       ['target_arch=="arm" or target_arch=="armv7"', {
         'prefer_fixed_point%': 1,
       }],
+      ['OS!="ios" and (target_arch!="arm" or arm_version>=7)', {
+        'rtc_use_openmax_dl%': 1,
+      }, {
+        'rtc_use_openmax_dl%': 0,
+      }],
     ], # conditions
   },
   'target_defaults': {
@@ -204,6 +210,16 @@
       }, {
         'conditions': [
           ['os_posix==1', {
+           'configurations': {
+              'Debug_Base': {
+                'defines': [
+                  # Chromium's build/common.gypi defines this for all posix
+                  # _except_ for ios & mac.  We want it there as well, e.g.
+                  # because ASSERT and friends trigger off of it.
+                  '_DEBUG',
+                ],
+              },
+            },
             'conditions': [
               # -Wextra is currently disabled in Chromium's common.gypi. Enable
               # for targets that can handle it. For Android/arm64 right now
@@ -235,6 +251,11 @@
           }],
         ],
       }],
+      ['target_arch=="arm64"', {
+        'defines': [
+          'WEBRTC_ARCH_ARM',
+        ],
+      }],
       ['target_arch=="arm" or target_arch=="armv7"', {
         'defines': [
           'WEBRTC_ARCH_ARM',
@@ -252,7 +273,7 @@
           }],
         ],
       }],
-      ['target_arch=="mipsel"', {
+      ['target_arch=="mipsel" and mips_arch_variant!="r6" and android_webview_build==0', {
         'defines': [
           'MIPS32_LE',
         ],
@@ -269,7 +290,7 @@
               '-msoft-float',
             ],
           }],
-          ['mips_arch_variant=="mips32r2"', {
+          ['mips_arch_variant=="r2"', {
             'defines': [
               'MIPS32_R2_LE',
             ],