diff --git a/DEPS b/DEPS index cb79bbb61..ac20e0627 100644 --- a/DEPS +++ b/DEPS @@ -37,10 +37,8 @@ deps = { Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad', 'src/tools': Var('chromium_git') + '/chromium/src/tools' + '@' + 'f2c6ed916b94176158763400de308c2afd56b259', - 'src/tools/gyp': - Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', - 'src/tools/swarming_client': - Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), + 'src/tools/swarming_client': + Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), # libyuv-only dependencies (not present in Chromium). 'src/third_party/gflags': @@ -845,7 +843,7 @@ hooks = [ # Note: On Win, this should run after win_toolchain, as it may use it. 'name': 'clang', 'pattern': '.', - 'action': ['python', 'src/tools/clang/scripts/update.py', '--if-needed'], + 'action': ['python', 'src/tools/clang/scripts/update.py'], }, { # Update LASTCHANGE. diff --git a/all.gyp b/all.gyp deleted file mode 100644 index cc72d9d6f..000000000 --- a/all.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2013 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -# all.gyp and All target are for benefit of android gyp build. -{ - 'targets': [ - { - 'target_name': 'All', - 'type': 'none', - 'dependencies': [ - 'libyuv.gyp:*', - 'libyuv_test.gyp:*', - ], - }, - ], -} diff --git a/gyp_libyuv b/gyp_libyuv deleted file mode 100755 index 445b924f1..000000000 --- a/gyp_libyuv +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2014 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -# This script is used to run GYP for libyuv. It contains selected parts of the -# main function from the src/build/gyp_chromium file. - -import glob -import os -import shlex -import sys - -checkout_root = os.path.dirname(os.path.realpath(__file__)) - -sys.path.insert(0, os.path.join(checkout_root, 'build')) -import gyp_chromium -import gyp_helper -import vs_toolchain - -sys.path.insert(0, os.path.join(checkout_root, 'tools', 'gyp', 'pylib')) -import gyp - -def GetSupplementalFiles(): - """Returns a list of the supplemental files that are included in all GYP - sources.""" - # Can't use the one in gyp_chromium since the directory location of the root - # is different. - return glob.glob(os.path.join(checkout_root, '*', 'supplement.gypi')) - - -if __name__ == '__main__': - args = sys.argv[1:] - - if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)): - print 'Skipping gyp_libyuv due to GYP_CHROMIUM_NO_ACTION env var.' - sys.exit(0) - - # This could give false positives since it doesn't actually do real option - # parsing. Oh well. - gyp_file_specified = False - for arg in args: - if arg.endswith('.gyp'): - gyp_file_specified = True - break - - # If we didn't get a file, assume 'all.gyp' in the root of the checkout. - if not gyp_file_specified: - # Because of a bug in gyp, simply adding the abspath to all.gyp doesn't - # work, but chdir'ing and adding the relative path does. Spooky :/ - os.chdir(checkout_root) - args.append('all.gyp') - - # There shouldn't be a circular dependency relationship between .gyp files, - args.append('--no-circular-check') - - # Default to ninja unless GYP_GENERATORS is set. - if not os.environ.get('GYP_GENERATORS'): - os.environ['GYP_GENERATORS'] = 'ninja' - - vs2013_runtime_dll_dirs = None - if int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')): - vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() - - # Enforce gyp syntax checking. This adds about 20% execution time. - args.append('--check') - - supplemental_includes = gyp_chromium.GetSupplementalFiles() - gyp_vars_dict = gyp_chromium.GetGypVars(supplemental_includes) - - # Automatically turn on crosscompile support for platforms that need it. - if all(('ninja' in os.environ.get('GYP_GENERATORS', ''), - gyp_vars_dict.get('OS') in ['android', 'ios'], - 'GYP_CROSSCOMPILE' not in os.environ)): - os.environ['GYP_CROSSCOMPILE'] = '1' - - args.extend(['-I' + i for i in - gyp_chromium.additional_include_files(supplemental_includes, - args)]) - - # Set the gyp depth variable to the root of the checkout. - args.append('--depth=' + os.path.relpath(checkout_root)) - - print 'Updating projects from gyp files...' - sys.stdout.flush() - - # Off we go... - gyp_rc = gyp.main(args) - - if vs2013_runtime_dll_dirs: - x64_runtime, x86_runtime = vs2013_runtime_dll_dirs - vs_toolchain.CopyVsRuntimeDlls( - os.path.join(checkout_root, gyp_chromium.GetOutputDirectory()), - (x86_runtime, x64_runtime)) - - sys.exit(gyp_rc) diff --git a/gyp_libyuv.py b/gyp_libyuv.py deleted file mode 100644 index bb32ec39d..000000000 --- a/gyp_libyuv.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2014 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - - -# This script is a modified copy of the src/build/gyp_chromium.py file. -# It is needed for parallel processing. - -# This file is (possibly, depending on python version) imported by -# gyp_libyuv when GYP_PARALLEL=1 and it creates sub-processes -# through the multiprocessing library. - -# Importing in Python 2.6 (fixed in 2.7) on Windows doesn't search for -# imports that don't end in .py (and aren't directories with an -# __init__.py). This wrapper makes "import gyp_libyuv" work with -# those old versions and makes it possible to execute gyp_libyuv.py -# directly on Windows where the extension is useful. - -import os - -path = os.path.abspath(os.path.split(__file__)[0]) -execfile(os.path.join(path, 'gyp_libyuv')) diff --git a/libyuv.gyp b/libyuv.gyp deleted file mode 100644 index ef8d87064..000000000 --- a/libyuv.gyp +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 2011 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'includes': [ - 'libyuv.gypi', - ], - # Make sure that if we are being compiled to an xcodeproj, nothing tries to - # include a .pch. - 'xcode_settings': { - 'GCC_PREFIX_HEADER': '', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'NO', - }, - 'variables': { - 'use_system_libjpeg%': 0, - # Can be enabled if your jpeg has GYP support. - 'libyuv_disable_jpeg%': 1, - # 'chromium_code' treats libyuv as internal and increases warning level. - 'chromium_code': 1, - # clang compiler default variable usable by other apps that include libyuv. - 'clang%': 0, - # Link-Time Optimizations. - 'use_lto%': 0, - 'mips_msa%': 0, # Default to msa off. - 'mips_mmi%': 0, # Default to mmi off. - 'build_neon': 0, - 'build_msa': 0, - 'build_mmi': 0, - 'conditions': [ - ['(target_arch == "armv7" or target_arch == "armv7s" or \ - (target_arch == "arm" and arm_version >= 7) or target_arch == "arm64")\ - and (arm_neon == 1 or arm_neon_optional == 1)', { - 'build_neon': 1, - }], - ['(target_arch == "mipsel" or target_arch == "mips64el")\ - and (mips_msa == 1)', - { - 'build_msa': 1, - }], - ['(target_arch == "mipsel" or target_arch == "mips64el")\ - and (mips_mmi == 1)', - { - 'build_mmi': 1, - }], - ], - }, - - 'targets': [ - { - '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, - 'conditions': [ - # Disable -Wunused-parameter - ['clang == 1', { - 'cflags': [ - '-Wno-unused-parameter', - ], - }], - ['build_neon != 0', { - 'defines': [ - 'LIBYUV_NEON', - ], - 'cflags!': [ - '-mfpu=vfp', - '-mfpu=vfpv3', - '-mfpu=vfpv3-d16', - # '-mthumb', # arm32 not thumb - ], - 'conditions': [ - # Disable LTO in libyuv_neon target due to gcc 4.9 compiler bug. - ['clang == 0 and use_lto == 1', { - 'cflags!': [ - '-flto', - '-ffat-lto-objects', - ], - }], - # arm64 does not need -mfpu=neon option as neon is not optional - ['target_arch != "arm64"', { - 'cflags': [ - '-mfpu=neon', - # '-marm', # arm32 not thumb - ], - }], - ], - }], - ['build_msa != 0', { - 'defines': [ - 'LIBYUV_MSA', - ], - }], - ['build_mmi != 0', { - 'defines': [ - 'LIBYUV_MMI', - ], - }], - ['OS != "ios" and libyuv_disable_jpeg != 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', - ], - }, { - 'dependencies': [ - '<(DEPTH)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg', - ], - }], - [ 'use_system_libjpeg == 1', { - 'link_settings': { - 'libraries': [ - '-ljpeg', - ], - } - }], - ], - }], - ], #conditions - 'defines': [ - # Enable the following 3 macros to turn off assembly for specified CPU. - # 'LIBYUV_DISABLE_X86', - # 'LIBYUV_DISABLE_NEON', - # Enable the following macro to build libyuv as a shared library (dll). - # 'LIBYUV_USING_SHARED_LIBRARY', - # TODO(fbarchard): Make these into gyp defines. - ], - 'include_dirs': [ - 'include', - '.', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'include', - '.', - ], - 'conditions': [ - ['OS == "android" and target_arch == "arm64"', { - 'ldflags': [ - '-Wl,--dynamic-linker,/system/bin/linker64', - ], - }], - ['OS == "android" and target_arch != "arm64"', { - 'ldflags': [ - '-Wl,--dynamic-linker,/system/bin/linker', - ], - }], - ], #conditions - }, - 'sources': [ - '<@(libyuv_sources)', - ], - }, - ], # targets. -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/libyuv.gypi b/libyuv.gypi deleted file mode 100644 index 9424580a0..000000000 --- a/libyuv.gypi +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2014 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'variables': { - 'libyuv_sources': [ - # includes. - 'include/libyuv.h', - 'include/libyuv/basic_types.h', - 'include/libyuv/compare.h', - 'include/libyuv/convert.h', - 'include/libyuv/convert_argb.h', - 'include/libyuv/convert_from.h', - 'include/libyuv/convert_from_argb.h', - 'include/libyuv/cpu_id.h', - 'include/libyuv/macros_msa.h', - 'include/libyuv/mjpeg_decoder.h', - 'include/libyuv/planar_functions.h', - 'include/libyuv/rotate.h', - 'include/libyuv/rotate_argb.h', - 'include/libyuv/rotate_row.h', - 'include/libyuv/row.h', - 'include/libyuv/scale.h', - 'include/libyuv/scale_argb.h', - 'include/libyuv/scale_row.h', - 'include/libyuv/version.h', - 'include/libyuv/video_common.h', - - # sources. - 'source/compare.cc', - 'source/compare_common.cc', - 'source/compare_gcc.cc', - 'source/compare_msa.cc', - 'source/compare_mmi.cc', - 'source/compare_neon.cc', - 'source/compare_neon64.cc', - 'source/compare_win.cc', - 'source/convert.cc', - 'source/convert_argb.cc', - 'source/convert_from.cc', - 'source/convert_from_argb.cc', - 'source/convert_jpeg.cc', - 'source/convert_to_argb.cc', - 'source/convert_to_i420.cc', - 'source/cpu_id.cc', - 'source/mjpeg_decoder.cc', - 'source/mjpeg_validate.cc', - 'source/planar_functions.cc', - 'source/rotate.cc', - 'source/rotate_any.cc', - 'source/rotate_argb.cc', - 'source/rotate_common.cc', - 'source/rotate_gcc.cc', - 'source/rotate_msa.cc', - 'source/rotate_mmi.cc', - 'source/rotate_neon.cc', - 'source/rotate_neon64.cc', - 'source/rotate_win.cc', - 'source/row_any.cc', - 'source/row_common.cc', - 'source/row_gcc.cc', - 'source/row_msa.cc', - 'source/row_mmi.cc', - 'source/row_neon.cc', - 'source/row_neon64.cc', - 'source/row_win.cc', - 'source/scale.cc', - 'source/scale_any.cc', - 'source/scale_argb.cc', - 'source/scale_common.cc', - 'source/scale_gcc.cc', - 'source/scale_msa.cc', - 'source/scale_mmi.cc', - 'source/scale_neon.cc', - 'source/scale_neon64.cc', - 'source/scale_win.cc', - 'source/video_common.cc', - ], - } -} diff --git a/libyuv_nacl.gyp b/libyuv_nacl.gyp deleted file mode 100644 index b8fe57ee3..000000000 --- a/libyuv_nacl.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2014 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'includes': [ - 'libyuv.gypi', - '../../native_client/build/untrusted.gypi', - ], - 'targets': [ - { - 'target_name': 'libyuv_nacl', - 'type': 'none', - 'variables': { - 'nlib_target': 'libyuv_nacl.a', - 'build_glibc': 0, - 'build_newlib': 0, - 'build_pnacl_newlib': 1, - }, - 'include_dirs': [ - 'include', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'include', - ], - }, - 'sources': [ - '<@(libyuv_sources)', - ], - }, # target libyuv_nacl - ] -} diff --git a/libyuv_test.gyp b/libyuv_test.gyp deleted file mode 100644 index e3509dc7c..000000000 --- a/libyuv_test.gyp +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2011 The LibYuv Project Authors. All rights reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'variables': { - # Can be enabled if your jpeg has GYP support. - 'libyuv_disable_jpeg%': 1, - 'mips_msa%': 0, # Default to msa off. - 'mips_mmi%': 0, # Default to mmi off. - }, - 'targets': [ - { - 'target_name': 'libyuv_unittest', - 'type': '<(gtest_target_type)', - 'dependencies': [ - 'libyuv.gyp:libyuv', - 'testing/gtest.gyp:gtest', - 'third_party/gflags/gflags.gyp:gflags', - ], - 'direct_dependent_settings': { - 'defines': [ - 'GTEST_RELATIVE_PATH', - ], - }, - 'export_dependent_settings': [ - '<(DEPTH)/testing/gtest.gyp:gtest', - ], - 'sources': [ - # headers - 'unit_test/unit_test.h', - - # sources - 'unit_test/basictypes_test.cc', - 'unit_test/compare_test.cc', - 'unit_test/color_test.cc', - 'unit_test/convert_test.cc', - 'unit_test/cpu_test.cc', - 'unit_test/cpu_thread_test.cc', - 'unit_test/math_test.cc', - 'unit_test/planar_test.cc', - 'unit_test/rotate_argb_test.cc', - 'unit_test/rotate_test.cc', - 'unit_test/scale_argb_test.cc', - 'unit_test/scale_test.cc', - 'unit_test/unit_test.cc', - 'unit_test/video_common_test.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ - '-fexceptions', - ], - }], - [ 'OS == "ios"', { - 'xcode_settings': { - 'DEBUGGING_SYMBOLS': 'YES', - 'DEBUG_INFORMATION_FORMAT' : 'dwarf-with-dsym', - # Work around compile issue with isosim.mm, see - # https://code.google.com/p/libyuv/issues/detail?id=548 for details. - 'WARNING_CFLAGS': [ - '-Wno-sometimes-uninitialized', - ], - }, - 'cflags': [ - '-Wno-sometimes-uninitialized', - ], - }], - [ 'OS != "ios" and libyuv_disable_jpeg != 1', { - 'defines': [ - 'HAVE_JPEG', - ], - }], - ['OS=="android"', { - 'dependencies': [ - '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', - ], - }], - # TODO(YangZhang): These lines can be removed when high accuracy - # YUV to RGB to Neon is ported. - [ '(target_arch == "armv7" or target_arch == "armv7s" \ - or (target_arch == "arm" and arm_version >= 7) \ - or target_arch == "arm64") \ - and (arm_neon == 1 or arm_neon_optional == 1)', { - 'defines': [ - 'LIBYUV_NEON' - ], - }], - [ '(target_arch == "mipsel" or target_arch == "mips64el") \ - and (mips_msa == 1)', { - 'defines': [ - 'LIBYUV_MSA' - ], - }], - [ '(target_arch == "mipsel" or target_arch == "mips64el") \ - and (mips_mmi == 1)', { - 'defines': [ - 'LIBYUV_MMI' - ], - }], - ], # conditions - 'defines': [ - # Enable the following 3 macros to turn off assembly for specified CPU. - # 'LIBYUV_DISABLE_X86', - # 'LIBYUV_DISABLE_NEON', - # Enable the following macro to build libyuv as a shared library (dll). - # 'LIBYUV_USING_SHARED_LIBRARY', - ], - }, - { - 'target_name': 'compare', - 'type': 'executable', - 'dependencies': [ - 'libyuv.gyp:libyuv', - ], - 'sources': [ - # sources - 'util/compare.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ - '-fexceptions', - ], - }], - ], # conditions - }, - { - 'target_name': 'yuvconvert', - 'type': 'executable', - 'dependencies': [ - 'libyuv.gyp:libyuv', - ], - 'sources': [ - # sources - 'util/yuvconvert.cc', - ], - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ - '-fexceptions', - ], - }], - ], # conditions - }, - # TODO(fbarchard): Enable SSE2 and OpenMP for better performance. - { - 'target_name': 'psnr', - 'type': 'executable', - 'sources': [ - # sources - 'util/psnr_main.cc', - 'util/psnr.cc', - 'util/ssim.cc', - ], - 'dependencies': [ - 'libyuv.gyp:libyuv', - ], - 'conditions': [ - [ 'OS != "ios" and libyuv_disable_jpeg != 1', { - 'defines': [ - 'HAVE_JPEG', - ], - }], - ], # conditions - }, - - { - 'target_name': 'cpuid', - 'type': 'executable', - 'sources': [ - # sources - 'util/cpuid.c', - ], - 'dependencies': [ - 'libyuv.gyp:libyuv', - ], - }, - ], # targets - 'conditions': [ - ['OS=="android"', { - 'targets': [ - { - 'target_name': 'yuv_unittest_apk', - 'type': 'none', - 'variables': { - 'test_suite_name': 'yuv_unittest', - 'input_shlib_path': '<(SHARED_LIB_DIR)/(SHARED_LIB_PREFIX)libyuv_unittest<(SHARED_LIB_SUFFIX)', - }, - 'includes': [ - 'build/apk_test.gypi', - ], - 'dependencies': [ - 'libyuv_unittest', - ], - }, - ], - }], - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: