Bug 1284803 part 4 - Change libyuv.gyp for fixing build failure r=jesup
☠☠ backed out by 7a5831b90723 ☠ ☠
authorSotaro Ikeda <sotaro.ikeda.g@gmail.com>
Mon, 25 Jul 2016 18:20:55 -0700
changeset 331680 78a10fc91b52108a541b82d4c4adbdb95addd8bf
parent 331679 ccf9a31fe40d327d53eb1c46aad7ee3c6ff4da5e
child 331681 ac2f07864fb1059969eca26ffaa95a192d73cb07
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1284803
milestone50.0a1
Bug 1284803 part 4 - Change libyuv.gyp for fixing build failure r=jesup
media/libyuv/libyuv.gyp
--- a/media/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv.gyp
@@ -40,17 +40,17 @@
     {
       'target_name': 'libyuv',
       # Change type to 'shared_library' to build .so or .dll files.
       'type': 'static_library',
       'variables': {
         'optimize': 'max',  # enable O2 and ltcg.
       },
       # Allows libyuv.a redistributable library without external dependencies.
-      'standalone_static_library': 1,
+      # 'standalone_static_library': 1,
       'conditions': [
        # Disable -Wunused-parameter
         ['clang == 1', {
           'cflags': [
             '-Wno-unused-parameter',
          ],
         }],
         ['build_neon != 0', {
@@ -75,17 +75,17 @@
             ['target_arch != "arm64"', {
               'cflags': [
                 '-mfpu=neon',
                 # '-marm',  # arm32 not thumb
               ],
             }],
           ],
         }],
-        ['OS != "ios" and libyuv_disable_jpeg != 1', {
+        ['OS != "ios" and libyuv_disable_jpeg != 1 and build_with_mozilla != 1', {
           'defines': [
             'HAVE_JPEG'
           ],
           'conditions': [
             # Caveat system jpeg support may not support motion jpeg
             [ 'use_system_libjpeg == 1', {
               'dependencies': [
                  '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',