.if ${PORT_OPTIONS:MLANG_OC}

FIREFOX_I18N+=  oc

.endif

		LANG_OC \

LANG_OC_DESC?=	Occitan (lengadocian) language support

Revert bug 1393119, bug 1429819, bug 1436959 to unbreak WebRTC

diff --git media/webrtc/moz.build media/webrtc/moz.build

index 3aeb939a4e4b..115831cc69d5 100644

--- media/webrtc/moz.build

+++ media/webrtc/moz.build

@@ -11,7 +11,6 @@ with Files("signaling/**"):

     BUG_COMPONENT = ("Core", "WebRTC: Signaling")

 include('/build/gyp.mozbuild')

-include('/build/gn.mozbuild')

 webrtc_non_unified_sources = [

     'trunk/webrtc/common_audio/vad/vad_core.c',                                  # Because of name clash in the kInitCheck variable

@@ -57,6 +56,8 @@ webrtc_non_unified_sources = [

     'trunk/webrtc/video/overuse_frame_detector.cc',                              # Because of name clash with call_stats.cc on kWeightFactor

 ]

+GYP_DIRS += ['trunk']

+

 # Set gyp vars that webrtc needs when building under various analysis tools.

 # Primarily this prevents webrtc from setting NVALGRIND and breaking builds.

 gyp_vars_copy = gyp_vars.copy()

@@ -67,21 +68,12 @@ elif CONFIG['MOZ_ASAN']:

 elif CONFIG['MOZ_TSAN']:

     gyp_vars_copy.update(build_for_tool="tsan")

-GN_DIRS += ['trunk']

-

-gn_vars_copy = gn_vars.copy()

-

-GN_DIRS['trunk'].variables = gn_vars_copy

-GN_DIRS['trunk'].mozilla_flags = [

-    '-fobjc-arc',

-    '-mfpu=neon',

-    '-msse2',

-]

-

+GYP_DIRS['trunk'].input = 'trunk/peerconnection.gyp'

+GYP_DIRS['trunk'].variables = gyp_vars_copy

 # We allow warnings for third-party code that can be updated from upstream.

-GN_DIRS['trunk'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}

-GN_DIRS['trunk'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'

-GN_DIRS['trunk'].non_unified_sources += webrtc_non_unified_sources

+GYP_DIRS['trunk'].sandbox_vars['COMPILE_FLAGS'] = {'WARNINGS_AS_ERRORS': []}

+GYP_DIRS['trunk'].sandbox_vars['FINAL_LIBRARY'] = 'webrtc'

+GYP_DIRS['trunk'].non_unified_sources += webrtc_non_unified_sources

 if CONFIG['MOZ_WEBRTC_SIGNALING']:

     DIRS += [

diff --git media/webrtc/trunk/build/OWNERS media/webrtc/trunk/build/OWNERS

index c644ca7d5fd5..72e8ffc0db8a 100644

--- media/webrtc/trunk/build/OWNERS

+++ media/webrtc/trunk/build/OWNERS

@@ -1,22 +1 @@

-agrieve@chromium.org

-dpranke@chromium.org

-jbudorick@chromium.org

-jochen@chromium.org

-scottmg@chromium.org

-thakis@chromium.org

-brucedawson@chromium.org

-

-per-file .gitignore=*

-per-file mac_toolchain.py=erikchen@chromium.org

-per-file mac_toolchain.py=justincohen@chromium.org

-per-file package_mac_toolchain.py=erikchen@chromium.org

-per-file package_mac_toolchain.py=justincohen@chromium.org

-per-file whitespace_file.txt=*

-per-file OWNERS.status=*

-

-# gn-dev is probably a better team here, but the tooling won't let us

-# have more than one team per component, and infra-dev is a catch-all

-# for other build-related lists.

-#

-# TEAM: infra-dev@chromium.org

-# COMPONENT: Build

+*

diff --git media/webrtc/trunk/build/common.croc media/webrtc/trunk/build/common.croc

index fde7a8b29821..7281bb4eb4d8 100644

--- media/webrtc/trunk/build/common.croc

+++ media/webrtc/trunk/build/common.croc

@@ -57,7 +57,7 @@

     },

     # Don't include output dirs

     {

-      'regexp' : '.*/(Debug|Release|out|xcodebuild)/',

+      'regexp' : '.*/(Debug|Release|sconsbuild|out|xcodebuild)/',

       'include' : 0,

     },

     # Don't include third-party source

@@ -89,7 +89,7 @@

     },

     {

       'stat' : '100.0 * files_instrumented / files_executable',

-      'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g percent',

+      'format' : '*RESULT FilesInstrumentedPercent: files_instrumented_percent= %g',

     },

     {

       'stat' : 'lines_executable',

@@ -111,16 +111,16 @@

     },

     {

       'stat' : '100.0 * lines_covered / lines_executable',

-      'format' : '*RESULT PercentCovered: percent_covered= %g percent',

+      'format' : '*RESULT PercentCovered: percent_covered= %g',

     },

     {

       'stat' : '100.0 * lines_covered / lines_executable',

-      'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g percent',

+      'format' : '*RESULT PercentCoveredSource: percent_covered_source= %g',

       'group' : 'source',

     },

     {

       'stat' : '100.0 * lines_covered / lines_executable',

-      'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g percent',

+      'format' : '*RESULT PercentCoveredTest: percent_covered_test= %g',

       'group' : 'test',

     },

   ],

diff --git media/webrtc/trunk/build/compiler_version.py media/webrtc/trunk/build/compiler_version.py

index 8db010811096..eae7b176dd21 100755

--- media/webrtc/trunk/build/compiler_version.py

+++ media/webrtc/trunk/build/compiler_version.py

@@ -14,115 +14,63 @@ import re

 import subprocess

 import sys

-

-compiler_version_cache = {}  # Map from (compiler, tool) -> version.

-

-

-def Usage(program_name):

-  print '%s MODE TOOL' % os.path.basename(program_name)

-  print 'MODE: host or target.'

-  print 'TOOL: assembler or compiler or linker.'

-  return 1

-

-

-def ParseArgs(args):

-  if len(args) != 2:

-    raise Exception('Invalid number of arguments')

-  mode = args[0]

-  tool = args[1]

-  if mode not in ('host', 'target'):

-    raise Exception('Invalid mode: %s' % mode)

-  if tool not in ('assembler',):

-    raise Exception('Invalid tool: %s' % tool)

-  return mode, tool

-

-

-def GetEnvironFallback(var_list, default):

-  """Look up an environment variable from a possible list of variable names."""

-  for var in var_list:

-    if var in os.environ:

-      return os.environ[var]

-  return default

-

-

-def GetVersion(compiler, tool):

-  tool_output = tool_error = None

-  cache_key = (compiler, tool)

-  cached_version = compiler_version_cache.get(cache_key)

-  if cached_version:

-    return cached_version

+def GetVersion(compiler):

   try:

     # Note that compiler could be something tricky like "distcc g++".

-    if tool == "assembler":

-      compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"

-      # Unmodified: GNU assembler (GNU Binutils) 2.24

-      # Ubuntu: GNU assembler (GNU Binutils for Ubuntu) 2.22

-      # Fedora: GNU assembler version 2.23.2

-      version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)

-    else:

-      raise Exception("Unknown tool %s" % tool)

-

-    # Force the locale to C otherwise the version string could be localized

-    # making regex matching fail.

-    env = os.environ.copy()

-    env["LC_ALL"] = "C"

-    pipe = subprocess.Popen(compiler, shell=True, env=env,

+    compiler = compiler + " -dumpversion"

+    pipe = subprocess.Popen(compiler, shell=True,

                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)

-    tool_output, tool_error = pipe.communicate()

+    gcc_output, gcc_error = pipe.communicate()

     if pipe.returncode:

       raise subprocess.CalledProcessError(pipe.returncode, compiler)

-    parsed_output = version_re.match(tool_output)

-    result = parsed_output.group(1) + parsed_output.group(2)

-    compiler_version_cache[cache_key] = result

-    return result

+    result = re.match(r"(\d+)\.(\d+)", gcc_output)

+    return result.group(1) + result.group(2)

   except Exception, e:

-    if tool_error:

-      sys.stderr.write(tool_error)

+    if gcc_error:

+      sys.stderr.write(gcc_error)

     print >> sys.stderr, "compiler_version.py failed to execute:", compiler

     print >> sys.stderr, e

     return ""

+def GetVersionFromEnvironment(compiler_env):

+  """ Returns the version of compiler

+

+  If the compiler was set by the given environment variable and exists,

+  return its version, otherwise None is returned.

+  """

+  cxx = os.getenv(compiler_env, None)

+  if cxx:

+    cxx_version = GetVersion(cxx)

+    if cxx_version != "":

+      return cxx_version

+  return None

+

+def main():

+  # Check if CXX_target or CXX environment variable exists an if it does use

+  # that compiler.

+  # TODO: Fix ninja (see http://crbug.com/140900) instead and remove this code

+  # In ninja's cross compile mode, the CXX_target is target compiler, while

+  # the CXX is host. The CXX_target needs be checked first, though the target

+  # and host compiler have different version, there seems no issue to use the

+  # target compiler's version number as gcc_version in Android.

+  cxx_version = GetVersionFromEnvironment("CXX_target")

+  if cxx_version:

+    print cxx_version

+    return 0

+

+  cxx_version = GetVersionFromEnvironment("CXX")

+  if cxx_version:

+    print cxx_version

+    return 0

+

+  # Otherwise we check the g++ version.

+  gccversion = GetVersion("g++")

+  if gccversion != "":

+    print gccversion

+    return 0

-def main(args):

-  try:

-    (mode, tool) = ParseArgs(args[1:])

-  except Exception, e:

-    sys.stderr.write(e.message + '\n\n')

-    return Usage(args[0])

-

-  ret_code, result = ExtractVersion(mode, tool)

-  if ret_code == 0:

-    print result

-  return ret_code

-

-

-def DoMain(args):

-  """Hook to be called from gyp without starting a separate python

-  interpreter."""

-  (mode, tool) = ParseArgs(args)

-  ret_code, result = ExtractVersion(mode, tool)

-  if ret_code == 0:

-    return result

-  raise Exception("Failed to extract compiler version for args: %s" % args)

-

-

-def ExtractVersion(mode, tool):

-  # Check if various CXX environment variables exist and use them if they

-  # exist. The preferences and fallback order is a close approximation of

-  # GenerateOutputForConfig() in GYP's ninja generator.

-  # The main difference being not supporting GYP's make_global_settings.

-  environments = ['CXX_target', 'CXX']

-  if mode == 'host':

-    environments = ['CXX_host'] + environments;

-  compiler = GetEnvironFallback(environments, 'c++')

-

-  if compiler:

-    compiler_version = GetVersion(compiler, tool)

-    if compiler_version != "":

-      return (0, compiler_version)

-  return (1, None)

-

+  return 1

 if __name__ == "__main__":

-  sys.exit(main(sys.argv))

+  sys.exit(main())

diff --git media/webrtc/trunk/build/copy_test_data_ios.py media/webrtc/trunk/build/copy_test_data_ios.py

index 6f0302f9506e..51307358355e 100755

--- media/webrtc/trunk/build/copy_test_data_ios.py

+++ media/webrtc/trunk/build/copy_test_data_ios.py

@@ -13,16 +13,13 @@ import sys

 class WrongNumberOfArgumentsException(Exception):

   pass

-def EscapePath(path):

-  """Returns a path with spaces escaped."""

-  return path.replace(" ", "\\ ")

-

 def ListFilesForPath(path):

   """Returns a list of all the files under a given path."""

   output = []

-  # Ignore revision control metadata directories.

-  if (os.path.basename(path).startswith('.git') or

-      os.path.basename(path).startswith('.svn')):

+  # Ignore dotfiles and dot directories.

+  # TODO(rohitrao): This will fail to exclude cases where the initial argument

+  # is a relative path that starts with a dot.

+  if os.path.basename(path).startswith('.'):

     return output

   # Files get returned without modification.

@@ -40,10 +37,13 @@ def ListFilesForPath(path):

 def CalcInputs(inputs):

   """Computes the full list of input files for a set of command-line arguments.

   """

-  # |inputs| is a list of paths, which may be directories.

+  # |inputs| is a list of strings, each of which may contain muliple paths

+  # separated by spaces.

   output = []

   for input in inputs:

-    output.extend(ListFilesForPath(input))

+    tokens = input.split()

+    for token in tokens:

+      output.extend(ListFilesForPath(token))

   return output

 def CopyFiles(relative_filenames, output_basedir):

@@ -77,15 +77,14 @@ def DoMain(argv):

     raise WrongNumberOfArgumentsException('<input_files> required.')

   files_to_copy = CalcInputs(arglist)

-  escaped_files = [EscapePath(x) for x in CalcInputs(arglist)]

   if options.list_inputs:

-    return '\n'.join(escaped_files)

+    return '\n'.join(files_to_copy)

   if not options.output_dir:

     raise WrongNumberOfArgumentsException('-o required.')

   if options.list_outputs:

-    outputs = [os.path.join(options.output_dir, x) for x in escaped_files]

+    outputs = [os.path.join(options.output_dir, x) for x in files_to_copy]

     return '\n'.join(outputs)

   CopyFiles(files_to_copy, options.output_dir)

diff --git media/webrtc/trunk/build/cp.py media/webrtc/trunk/build/cp.py

index 0f32536b624b..dd98e1db15d2 100755

--- media/webrtc/trunk/build/cp.py

+++ media/webrtc/trunk/build/cp.py

@@ -9,14 +9,13 @@ This module works much like the cp posix command - it takes 2 arguments:

 (src, dst) and copies the file with path |src| to |dst|.

 """

-import os

 import shutil

 import sys

 def Main(src, dst):

   # Use copy instead of copyfile to ensure the executable bit is copied.

-  return shutil.copy(src, os.path.normpath(dst))

+  return shutil.copy(src, dst)

 if __name__ == '__main__':

diff --git media/webrtc/trunk/build/dir_exists.py media/webrtc/trunk/build/dir_exists.py

index 70d367ec2690..0a89bc87bbf6 100755

--- media/webrtc/trunk/build/dir_exists.py

+++ media/webrtc/trunk/build/dir_exists.py

@@ -8,16 +8,8 @@ import os.path

 import sys

 def main():

-  sys.stdout.write(_is_dir(sys.argv[1]))

+  sys.stdout.write(str(os.path.isdir(sys.argv[1])))

   return 0

-def _is_dir(dir_name):

-  return str(os.path.isdir(dir_name))

-

-def DoMain(args):

-  """Hook to be called from gyp without starting a separate python

-  interpreter."""

-  return _is_dir(args[0])

-

 if __name__ == '__main__':

   sys.exit(main())

diff --git media/webrtc/trunk/build/download_nacl_toolchains.py media/webrtc/trunk/build/download_nacl_toolchains.py

index cccecce9ef95..c2007d0f1038 100755

--- media/webrtc/trunk/build/download_nacl_toolchains.py

+++ media/webrtc/trunk/build/download_nacl_toolchains.py

@@ -6,7 +6,6 @@

 """Shim to run nacl toolchain download script only if there is a nacl dir."""

 import os

-import shutil

 import sys

@@ -14,46 +13,50 @@ def Main(args):

   # Exit early if disable_nacl=1.

   if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):

     return 0

-  if 'OS=android' in os.environ.get('GYP_DEFINES', ''):

-    return 0

   script_dir = os.path.dirname(os.path.abspath(__file__))

   src_dir = os.path.dirname(script_dir)

   nacl_dir = os.path.join(src_dir, 'native_client')

   nacl_build_dir = os.path.join(nacl_dir, 'build')

-  package_version_dir = os.path.join(nacl_build_dir, 'package_version')

-  package_version = os.path.join(package_version_dir, 'package_version.py')

-  if not os.path.exists(package_version):

-    print "Can't find '%s'" % package_version

+  download_script = os.path.join(nacl_build_dir, 'download_toolchains.py')

+  if not os.path.exists(download_script):

+    print "Can't find '%s'" % download_script

     print 'Presumably you are intentionally building without NativeClient.'

     print 'Skipping NativeClient toolchain download.'

     sys.exit(0)

-  sys.path.insert(0, package_version_dir)

-  import package_version

+  sys.path.insert(0, nacl_build_dir)

+  import download_toolchains

+  # TODO (robertm): Finish getting PNaCl ready for prime time.

   # BUG:

   # We remove this --optional-pnacl argument, and instead replace it with

-  # --no-pnacl for most cases.  However, if the bot name is an sdk

+  # --no-pnacl for most cases.  However, if the bot name is the pnacl_sdk

   # bot then we will go ahead and download it.  This prevents increasing the

   # gclient sync time for developers, or standard Chrome bots.

   if '--optional-pnacl' in args:

     args.remove('--optional-pnacl')

+    # By default we don't use PNaCl toolchain yet, unless on ARM, where

+    # there is no other toolchain to build untrusted code at the moment.

+    # So analyze if we're building for ARM, or on SDK buildbot.

+    # TODO(olonho): we need to invent more reliable way to get build

+    # configuration info, to know if we're building for ARM.

     use_pnacl = False

+    if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''):

+      use_pnacl = True

     buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '')

-    if 'pnacl' in buildbot_name and 'sdk' in buildbot_name:

+    if buildbot_name.find('pnacl') >= 0 and  buildbot_name.find('sdk') >= 0:

       use_pnacl = True

     if use_pnacl:

       print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n'

     else:

-      args = ['--exclude', 'pnacl_newlib'] + args

-

-  # Only download the ARM gcc toolchain if we are building for ARM

-  # TODO(olonho): we need to invent more reliable way to get build

-  # configuration info, to know if we're building for ARM.

-  if 'target_arch=arm' not in os.environ.get('GYP_DEFINES', ''):

-      args = ['--exclude', 'nacl_arm_newlib'] + args

+      args.append('--no-pnacl')

-  package_version.main(args)

+  # Append the name of the file to use as a version and hash source.

+  # NOTE:  While not recommended, it is possible to redirect this file to

+  # a chrome location to avoid branching NaCl if just a toolchain needs

+  # to be bumped.

+  args.append(os.path.join(nacl_dir,'TOOL_REVISIONS'))

+  download_toolchains.main(args)

   return 0

diff --git media/webrtc/trunk/build/extract_from_cab.py media/webrtc/trunk/build/extract_from_cab.py

index 080370ca9ade..1c928af36f93 100755

--- media/webrtc/trunk/build/extract_from_cab.py

+++ media/webrtc/trunk/build/extract_from_cab.py

@@ -12,7 +12,7 @@ import sys

 import tempfile

 def run_quiet(*args):

-  """Run 'expand' suppressing noisy output. Returns returncode from process."""

+  """Run 'expand' supressing noisy output. Returns returncode from process."""

   popen = subprocess.Popen(args, stdout=subprocess.PIPE)

   out, _ = popen.communicate()

   if popen.returncode:

diff --git media/webrtc/trunk/build/gdb-add-index media/webrtc/trunk/build/gdb-add-index

index 73367c835034..4975532213bc 100755

--- media/webrtc/trunk/build/gdb-add-index

+++ media/webrtc/trunk/build/gdb-add-index

@@ -4,181 +4,44 @@

 # found in the LICENSE file.

 #

 # Saves the gdb index for a given binary and its shared library dependencies.

-#

-# This will run gdb index in parallel on a number of binaries using SIGUSR1

-# as the communication mechanism to simulate a semaphore. Because of the

-# nature of this technique, using "set -e" is very difficult. The SIGUSR1

-# terminates a "wait" with an error which we need to interpret.

-#

-# When modifying this code, most of the real logic is in the index_one_file

-# function. The rest is cleanup + sempahore plumbing.

-

-function usage_exit {

-  echo "Usage: $0 [-f] [-r] [-n] <paths-to-binaries>..."

-  echo "  -f forces replacement of an existing index."

-  echo "  -r removes the index section."

-  echo "  -n don't extract the dependencies of each binary with lld."

-  echo "       e.g., $0 -n out/Debug/lib.unstripped/lib*"

-  echo

-  echo "  Set TOOLCHAIN_PREFIX to use a non-default set of binutils."

-  exit 1

-}

-

-# Cleanup temp directory and ensure all child jobs are dead-dead.

-function on_exit {

-  trap "" EXIT USR1  # Avoid reentrancy.

-

-  local jobs=$(jobs -p)

-  if [ -n "$jobs" ]; then

-    echo -n "Killing outstanding index jobs..."

-    kill -KILL $(jobs -p)

-    wait

-    echo "done"

-  fi

-

-  if [ -d "$directory" ]; then

-    echo -n "Removing temp directory $directory..."

-    rm -rf "$directory"

-    echo done

-  fi

-}

-

-# Add index to one binary.

-function index_one_file {

-  local file=$1

-  local basename=$(basename "$file")

-  local should_index_this_file="${should_index}"

-

-  local readelf_out=$(${TOOLCHAIN_PREFIX}readelf -S "$file")

-  if [[ $readelf_out =~ "gdb_index" ]]; then

-    if $remove_index; then

-      ${TOOLCHAIN_PREFIX}objcopy --remove-section .gdb_index "$file"

-      echo "Removed index from $basename."

-    else

-      echo "Skipped $basename -- already contains index."

-      should_index_this_file=false

-    fi

-  fi

-

-  if $should_index_this_file; then

-    local start=$(date +"%s%N")

-    echo "Adding index to $basename..."

-

-    ${TOOLCHAIN_PREFIX}gdb -batch "$file" -ex "save gdb-index $directory" \

-      -ex "quit"

-    local index_file="$directory/$basename.gdb-index"

-    if [ -f "$index_file" ]; then

-      ${TOOLCHAIN_PREFIX}objcopy --add-section .gdb_index="$index_file" \

-        --set-section-flags .gdb_index=readonly "$file" "$file"

-      local finish=$(date +"%s%N")

-      local elapsed=$(((finish - start) / 1000000))

-      echo "   ...$basename indexed. [${elapsed}ms]"

-    else

-      echo "   ...$basename unindexable."

-    fi

-  fi

-}

-# Functions that when combined, concurrently index all files in FILES_TO_INDEX

-# array. The global FILES_TO_INDEX is declared in the main body of the script.

-function async_index {

-  # Start a background subshell to run the index command.

-  {

-    index_one_file $1

-    kill -SIGUSR1 $$  # $$ resolves to the parent script.

-    exit 129  # See comment above wait loop at bottom.

-  } &

-}

+set -e

-cur_file_num=0

-function index_next {

-  if ((cur_file_num >= ${#files_to_index[@]})); then

-    return

-  fi

-

-  async_index "${files_to_index[cur_file_num]}"

-  ((cur_file_num += 1)) || true

-}

-

-########

-### Main body of the script.

-

-remove_index=false

-should_index=true

-should_index_deps=true

-files_to_index=()

-while (($# > 0)); do

-  case "$1" in

-    -h)

-      usage_exit

-      ;;

-    -f)

-      remove_index=true

-      ;;

-    -r)

-      remove_index=true

-      should_index=false

-      ;;

-    -n)

-      should_index_deps=false

-      ;;

-    -*)

-      echo "Invalid option: $1" >&2

-      usage_exit

-      ;;

-    *)

-      if [[ ! -f "$1" ]]; then

-        echo "Path $1 does not exist."

-        exit 1

-      fi

-      files_to_index+=("$1")

-      ;;

-  esac

-  shift

-done

-

-if ((${#files_to_index[@]} == 0)); then

-  usage_exit

+if [[ ! $# == 1 ]]; then

+  echo "Usage: $0 path-to-binary"

+  exit 1

 fi

-dependencies=()

-if $should_index_deps; then

-  for file in "${files_to_index[@]}"; do

-      # Append the shared library dependencies of this file that

-      # have the same dirname. The dirname is a signal that these

-      # shared libraries were part of the same build as the binary.

-      dependencies+=( \

-        $(ldd "$file" 2>/dev/null \

-          | grep $(dirname "$file") \

-          | sed "s/.*[ \t]\(.*\) (.*/\1/") \

-      )

-  done

+FILENAME="$1"

+if [[ ! -f "$FILENAME" ]]; then

+  echo "Path $FILENAME does not exist."

+  exit 1

 fi

-files_to_index+=("${dependencies[@]}")

-

-# Ensure we cleanup on on exit.

-trap on_exit EXIT INT

 # We're good to go! Create temp directory for index files.

-directory=$(mktemp -d)

-echo "Made temp directory $directory."

-

-# Start concurrent indexing.

-trap index_next USR1

-

-# 4 is an arbitrary default. When changing, remember we are likely IO bound

-# so basing this off the number of cores is not sensible.

-index_tasks=${INDEX_TASKS:-4}

-for ((i = 0; i < index_tasks; i++)); do

-  index_next

-done

-

-# Do a wait loop. Bash waits that terminate due a trap have an exit

-# code > 128. We also ensure that our subshell's "normal" exit occurs with

-# an exit code > 128. This allows us to do consider a > 128 exit code as

-# an indication that the loop should continue. Unfortunately, it also means

-# we cannot use set -e since technically the "wait" is failing.

-wait

-while (($? > 128)); do

-  wait

+DIRECTORY=$(mktemp -d)

+echo "Made temp directory $DIRECTORY."

+

+# Always remove directory on exit.

+trap "{ echo -n Removing temp directory $DIRECTORY...;

+  rm -rf $DIRECTORY; echo done; }" EXIT

+

+# Grab all the chromium shared library files.

+so_files=$(ldd "$FILENAME" 2>/dev/null \

+  | grep $(dirname "$FILENAME") \

+  | sed "s/.*[ \t]\(.*\) (.*/\1/")

+

+# Add index to binary and the shared library dependencies.

+for file in "$FILENAME" $so_files; do

+  basename=$(basename "$file")

+  echo -n "Adding index to $basename..."

+  readelf_out=$(readelf -S "$file")

+  if [[ $readelf_out =~ "gdb_index" ]]; then

+    echo "already contains index. Skipped."

+  else

+    gdb -batch "$file" -ex "save gdb-index $DIRECTORY" -ex "quit"

+    objcopy --add-section .gdb_index="$DIRECTORY"/$basename.gdb-index \

+      --set-section-flags .gdb_index=readonly "$file" "$file"

+    echo "done."

+  fi

 done

diff --git media/webrtc/trunk/build/gyp_chromium media/webrtc/trunk/build/gyp_chromium

index 4fc62bad9ba1..d13403403162 100755

--- media/webrtc/trunk/build/gyp_chromium

+++ media/webrtc/trunk/build/gyp_chromium

@@ -1,12 +1,175 @@

 #!/usr/bin/env python

+

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

 # Use of this source code is governed by a BSD-style license that can be

 # found in the LICENSE file.

-# Simple launcher script for gyp_chromium.py.

-# TODO(sbc): This should probably be shell script but for historical

-# reasons (all the python code used to live in this script without a

-# .py extension, and was often run as 'python gyp_chromium') it is

-# currently still python.

+# This script is wrapper for Chromium that adds some support for how GYP

+# is invoked by Chromium beyond what can be done in the gclient hooks.

+

+import glob

+import os

+import shlex

+import subprocess

+import sys

+

+script_dir = os.path.dirname(os.path.realpath(__file__))

+chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))

+

+sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))

+import gyp

+

+# Add paths so that pymod_do_main(...) can import files.

+sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))

+sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))

+sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build'))

+

+

+# On Windows, Psyco shortens warm runs of build/gyp_chromium by about

+# 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70

+# seconds.  Conversely, memory usage of build/gyp_chromium with Psyco

+# maxes out at about 158 MB vs. 132 MB without it.

+#

+# Psyco uses native libraries, so we need to load a different

+# installation depending on which OS we are running under. It has not

+# been tested whether using Psyco on our Mac and Linux builds is worth

+# it (the GYP running time is a lot shorter, so the JIT startup cost

+# may not be worth it).

+if sys.platform == 'win32':

+  try:

+    sys.path.insert(0, os.path.join(chrome_src, 'third_party', 'psyco_win32'))

+    import psyco

+  except:

+    psyco = None

+else:

+  psyco = None

+

+def apply_gyp_environment(file_path=None):

+  """

+  Reads in a *.gyp_env file and applies the valid keys to os.environ.

+  """

+  if not file_path or not os.path.exists(file_path):

+    return

+  file_contents = open(file_path).read()

+  try:

+    file_data = eval(file_contents, {'__builtins__': None}, None)

+  except SyntaxError, e:

+    e.filename = os.path.abspath(file_path)

+    raise

+  supported_vars = ( 'CC',

+                     'CHROMIUM_GYP_FILE',

+                     'CHROMIUM_GYP_SYNTAX_CHECK',

+                     'CXX',

+                     'GYP_DEFINES',

+                     'GYP_GENERATOR_FLAGS',

+                     'GYP_GENERATOR_OUTPUT',

+                     'GYP_GENERATORS', )

+  for var in supported_vars:

+    val = file_data.get(var)

+    if val:

+      if var in os.environ:

+        print 'INFO: Environment value for "%s" overrides value in %s.' % (

+            var, os.path.abspath(file_path)

+        )

+      else:

+        os.environ[var] = val

+

+def additional_include_files(args=[]):

+  """

+  Returns a list of additional (.gypi) files to include, without

+  duplicating ones that are already specified on the command line.

+  """

+  # Determine the include files specified on the command line.

+  # This doesn't cover all the different option formats you can use,

+  # but it's mainly intended to avoid duplicating flags on the automatic

+  # makefile regeneration which only uses this format.

+  specified_includes = set()

+  for arg in args:

+    if arg.startswith('-I') and len(arg) > 2:

+      specified_includes.add(os.path.realpath(arg[2:]))

+

+  result = []

+  def AddInclude(path):

+    if os.path.realpath(path) not in specified_includes:

+      result.append(path)

+

+  # Always include common.gypi.

+  AddInclude(os.path.join(script_dir, 'common.gypi'))

+

+  # Optionally add supplemental .gypi files if present.

+  supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))

+  for supplement in supplements:

+    AddInclude(supplement)

+

+  return result

+

+if __name__ == '__main__':

+  args = sys.argv[1:]

+

+  # Use the Psyco JIT if available.

+  if psyco:

+    psyco.profile()

+    print "Enabled Psyco JIT."

+

+  # Fall back on hermetic python if we happen to get run under cygwin.

+  # TODO(bradnelson): take this out once this issue is fixed:

+  #    http://code.google.com/p/gyp/issues/detail?id=177

+  if sys.platform == 'cygwin':

+    python_dir = os.path.join(chrome_src, 'third_party', 'python_26')

+    env = os.environ.copy()

+    env['PATH'] = python_dir + os.pathsep + env.get('PATH', '')

+    p = subprocess.Popen(

+       [os.path.join(python_dir, 'python.exe')] + sys.argv,

+       env=env, shell=False)

+    p.communicate()

+    sys.exit(p.returncode)

+

+  if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:

+    # Update the environment based on chromium.gyp_env

+    gyp_env_path = os.path.join(os.path.dirname(chrome_src), 'chromium.gyp_env')

+    apply_gyp_environment(gyp_env_path)

+

+  # 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, check an env var, and then fall back to

+  # assuming 'all.gyp' from the same directory as the script.

+  if not gyp_file_specified:

+    gyp_file = os.environ.get('CHROMIUM_GYP_FILE')

+    if gyp_file:

+      # Note that CHROMIUM_GYP_FILE values can't have backslashes as

+      # path separators even on Windows due to the use of shlex.split().

+      args.extend(shlex.split(gyp_file))

+    else:

+      args.append(os.path.join(script_dir, 'all.gyp'))

+

+  args.extend(['-I' + i for i in additional_include_files(args)])

+

+  # There shouldn't be a circular dependency relationship between .gyp files,

+  # but in Chromium's .gyp files, on non-Mac platforms, circular relationships

+  # currently exist.  The check for circular dependencies is currently

+  # bypassed on other platforms, but is left enabled on the Mac, where a

+  # violation of the rule causes Xcode to misbehave badly.

+  # TODO(mark): Find and kill remaining circular dependencies, and remove this

+  # option.  http://crbug.com/35878.

+  # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the

+  # list.

+  if sys.platform not in ('darwin',):

+    args.append('--no-circular-check')

+

+  # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check

+  # to enfore syntax checking.

+  syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')

+  if syntax_check and int(syntax_check):

+    args.append('--check')

+

+  print 'Updating projects from gyp files...'

+  sys.stdout.flush()

-execfile(__file__ + '.py')

+  # Off we go...

+  sys.exit(gyp.main(args))

diff --git media/webrtc/trunk/build/install-build-deps-android.sh media/webrtc/trunk/build/install-build-deps-android.sh

index 06f79aee9984..0a90d3b10c05 100755

--- media/webrtc/trunk/build/install-build-deps-android.sh

+++ media/webrtc/trunk/build/install-build-deps-android.sh

@@ -1,78 +1,101 @@

-#!/bin/bash

+#!/bin/bash -e

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

 # Use of this source code is governed by a BSD-style license that can be

 # found in the LICENSE file.

-# Script to install everything needed to build chromium on android, including

-# items requiring sudo privileges.

-# See https://www.chromium.org/developers/how-tos/android-build-instructions

+# Script to install everything needed to build chromium on android that

+# requires sudo privileges.

+# See http://code.google.com/p/chromium/wiki/AndroidBuildInstructions

-args="$@"

+# This script installs the sun-java6 packages (bin, jre and jdk). Sun requires

+# a license agreement, so upon installation it will prompt the user. To get

+# past the curses-based dialog press TAB <ret> TAB <ret> to agree.

 if ! uname -m | egrep -q "i686|x86_64"; then

   echo "Only x86 architectures are currently supported" >&2

   exit

 fi

-# Exit if any commands fail.

-set -e

+if [ "x$(id -u)" != x0 ]; then

+  echo "Running as non-root user."

+  echo "You might have to enter your password one or more times for 'sudo'."

+  echo

+fi

-lsb_release=$(lsb_release --codename --short)

+# The temporary directory used to store output of update-java-alternatives

+TEMPDIR=$(mktemp -d)

+cleanup() {

+  local status=${?}

+  trap - EXIT

+  rm -rf "${TEMPDIR}"

+  exit ${status}

+}

+trap cleanup EXIT

-# Install first the default Linux build deps.

-"$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \

-  --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}"

+sudo apt-get update

 # Fix deps

 sudo apt-get -f install

-# common

-sudo apt-get -y install lib32z1 lighttpd python-pexpect xvfb x11-utils

-

-# Some binaries in the Android SDK require 32-bit libraries on the host.

-# See https://developer.android.com/sdk/installing/index.html?pkg=tools

-sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386

+# Install deps

+# This step differs depending on what Ubuntu release we are running

+# on since the package names are different, and Sun's Java must

+# be installed manually on late-model versions.

-# Required by //components/cronet/tools/generate_javadoc.py

-# TODO(375324): Stop requiring ANT.

-sudo apt-get -y install ant

-

-# Required for apk-patch-size-estimator

-sudo apt-get -y install bsdiff

-

-# Do our own error handling for java.

-set +e

-

-function IsJava8() {

-  # Arg is either "java" or "javac"

-  $1 -version 2>&1 | grep -q '1\.8'

-}

-

-if ! (IsJava8 java && IsJava8 javac); then

-  sudo apt-get -y install openjdk-8-jre openjdk-8-jdk

-fi

-

-# There can be several reasons why java8 is not default despite being installed.

-# Just show an error and exit.

-if ! (IsJava8 java && IsJava8 javac); then

-  echo

-  echo "Automatic java installation failed."

-  echo '`java -version` reports:'

-  java -version

-  echo

-  echo '`javac -version` reports:'

-  javac -version

-  echo

-  echo "Please ensure that JDK 8 is installed and resolves first in your PATH."

-  echo -n '`which java` reports: '

-  which java

-  echo -n '`which javac` reports: '

-  which javac

-  echo

-  echo "You might also try running:"

-  echo "    sudo update-java-alternatives -s java-1.8.0-openjdk-amd64"

-  exit 1

+# common

+sudo apt-get -y install python-pexpect xvfb x11-utils

+

+if /usr/bin/lsb_release -r -s | grep -q "12."; then

+  # Ubuntu 12.x

+  sudo apt-get -y install ant

+

+  # Java can not be installed via ppa on Ubuntu 12.04+ so we'll

+  # simply check to see if it has been setup properly -- if not

+  # let the user know.

+

+  if ! java -version 2>&1 | grep -q "Java(TM)"; then

+    echo "****************************************************************"

+    echo "You need to install the Oracle Java SDK from http://goo.gl/uPRSq"

+    echo "and configure it as the default command-line Java environment."

+    echo "****************************************************************"

+    exit

+  fi

+

+else

+  # Ubuntu 10.x

+

+  sudo apt-get -y install ant1.8

+

+  # Install sun-java6 stuff

+  sudo apt-get -y install sun-java6-bin sun-java6-jre sun-java6-jdk

+

+  # Switch version of Java to java-6-sun

+  # Sun's java is missing certain Java plugins (e.g. for firefox, mozilla).

+  # These are not required to build, and thus are treated only as warnings.

+  # Any errors in updating java alternatives which are not '*-javaplugin.so'

+  # will cause errors and stop the script from completing successfully.

+  if ! sudo update-java-alternatives -s java-6-sun \

+            >& "${TEMPDIR}"/update-java-alternatives.out

+  then

+    # Check that there are the expected javaplugin.so errors for the update

+    if grep 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out >& \

+           /dev/null

+    then

+      # Print as warnings all the javaplugin.so errors

+      echo 'WARNING: java-6-sun has no alternatives for the following plugins:'

+      grep 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out

+    fi

+    # Check if there are any errors that are not javaplugin.so

+    if grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out \

+           >& /dev/null

+    then

+      # If there are non-javaplugin.so errors, treat as errors and exit

+      echo 'ERRORS: Failed to update alternatives for java-6-sun:'

+      grep -v 'javaplugin.so' "${TEMPDIR}"/update-java-alternatives.out

+      exit 1

+    fi

+  fi

 fi

 echo "install-build-deps-android.sh complete."

diff --git media/webrtc/trunk/build/install-build-deps.sh media/webrtc/trunk/build/install-build-deps.sh

index c965a9b38e06..b77e23a6d9f6 100755

--- media/webrtc/trunk/build/install-build-deps.sh

+++ media/webrtc/trunk/build/install-build-deps.sh

@@ -5,516 +5,166 @@

 # found in the LICENSE file.

 # Script to install everything needed to build chromium (well, ideally, anyway)

-# See https://chromium.googlesource.com/chromium/src/+/master/docs/linux_build_instructions.md

+# See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions

+# and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit

 usage() {

   echo "Usage: $0 [--options]"

   echo "Options:"

   echo "--[no-]syms: enable or disable installation of debugging symbols"

-  echo "--lib32: enable installation of 32-bit libraries, e.g. for V8 snapshot"

-  echo "--[no-]arm: enable or disable installation of arm cross toolchain"

-  echo "--[no-]chromeos-fonts: enable or disable installation of Chrome OS"\

-       "fonts"

-  echo "--[no-]nacl: enable or disable installation of prerequisites for"\

-       "building standalone NaCl and all its toolchains"

+  echo "--[no-]lib32: enable or disable installation of 32 bit libraries"

   echo "--no-prompt: silently select standard options/defaults"

-  echo "--quick-check: quickly try to determine if dependencies are installed"

-  echo "               (this avoids interactive prompts and sudo commands,"

-  echo "               so might not be 100% accurate)"

-  echo "--unsupported: attempt installation even on unsupported systems"

   echo "Script will prompt interactively if options not given."

   exit 1

 }

-# Waits for the user to press 'Y' or 'N'. Either uppercase of lowercase is

-# accepted. Returns 0 for 'Y' and 1 for 'N'. If an optional parameter has

-# been provided to yes_no(), the function also accepts RETURN as a user input.

-# The parameter specifies the exit code that should be returned in that case.

-# The function will echo the user's selection followed by a newline character.

-# Users can abort the function by pressing CTRL-C. This will call "exit 1".

-yes_no() {

-  if [ 0 -ne "${do_default-0}" ] ; then

-    [ $1 -eq 0 ] && echo "Y" || echo "N"

-    return $1

-  fi

-  local c

-  while :; do

-    c="$(trap 'stty echo -iuclc icanon 2>/dev/null' EXIT INT TERM QUIT

-         stty -echo iuclc -icanon 2>/dev/null

-         dd count=1 bs=1 2>/dev/null | od -An -tx1)"

-    case "$c" in

-      " 0a") if [ -n "$1" ]; then

-               [ $1 -eq 0 ] && echo "Y" || echo "N"

-               return $1

-             fi

-             ;;

-      " 79") echo "Y"

-             return 0

-             ;;

-      " 6e") echo "N"

-             return 1

-             ;;

-      "")    echo "Aborted" >&2

-             exit 1

-             ;;

-      *)     # The user pressed an unrecognized key. As we are not echoing

-             # any incorrect user input, alert the user by ringing the bell.

-             (tput bel) 2>/dev/null

-             ;;

-    esac

-  done

-}

-

-# Checks whether a particular package is available in the repos.

-# USAGE: $ package_exists <package name>

-package_exists() {

-  [ ! -z "`apt-cache search --names-only "$1"`" ]

-}

-

-# These default to on because (some) bots need them and it keeps things

-# simple for the bot setup if all bots just run the script in its default

-# mode.  Developers who don't want stuff they don't need installed on their

-# own workstations can pass --no-arm --no-nacl when running the script.

-do_inst_arm=1

-do_inst_nacl=1

-

 while test "$1" != ""

 do

   case "$1" in

   --syms)                   do_inst_syms=1;;

   --no-syms)                do_inst_syms=0;;

   --lib32)                  do_inst_lib32=1;;

-  --arm)                    do_inst_arm=1;;

-  --no-arm)                 do_inst_arm=0;;

-  --chromeos-fonts)         do_inst_chromeos_fonts=1;;

-  --no-chromeos-fonts)      do_inst_chromeos_fonts=0;;

-  --nacl)                   do_inst_nacl=1;;

-  --no-nacl)                do_inst_nacl=0;;

+  --no-lib32)               do_inst_lib32=0;;

   --no-prompt)              do_default=1

                             do_quietly="-qq --assume-yes"

     ;;

-  --quick-check)            do_quick_check=1;;

-  --unsupported)            do_unsupported=1;;

   *) usage;;

   esac

   shift

 done

-if test "$do_inst_arm" = "1"; then

-  do_inst_lib32=1

-fi

-

-# Check for lsb_release command in $PATH

-if ! which lsb_release > /dev/null; then

-  echo "ERROR: lsb_release not found in \$PATH" >&2

-  exit 1;

+if ! egrep -q \

+    'Ubuntu (10\.04|10\.10|11\.04|11\.10|12\.04|lucid|maverick|natty|oneiric|precise)' \

+    /etc/issue; then

+  echo "Only Ubuntu 10.04 (lucid) through 12.04 (precise) are currently" \

+      "supported" >&2

+  exit 1

 fi

-distro_codename=$(lsb_release --codename --short)

-distro_id=$(lsb_release --id --short)

-supported_codenames="(trusty|xenial|yakkety)"

-supported_ids="(Debian)"

-if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then

-  if [[ ! $distro_codename =~ $supported_codenames &&

-        ! $distro_id =~ $supported_ids ]]; then

-    echo -e "ERROR: The only supported distros are\n" \

-      "\tUbuntu 14.04 (trusty)\n" \

-      "\tUbuntu 16.04 (xenial)\n" \

-      "\tUbuntu 16.10 (yakkety)\n" \

-      "\tDebian 8 (jessie) or later" >&2

-    exit 1

-  fi

-

-  if ! uname -m | egrep -q "i686|x86_64"; then

-    echo "Only x86 architectures are currently supported" >&2

-    exit

-  fi

+if ! uname -m | egrep -q "i686|x86_64"; then

+  echo "Only x86 architectures are currently supported" >&2

+  exit

 fi

-if [ "x$(id -u)" != x0 ] && [ 0 -eq "${do_quick_check-0}" ]; then

+if [ "x$(id -u)" != x0 ]; then

   echo "Running as non-root user."

   echo "You might have to enter your password one or more times for 'sudo'."

   echo

 fi

 # Packages needed for chromeos only

-chromeos_dev_list="libbluetooth-dev libxkbcommon-dev realpath"

-

-# Packages needed for development

-dev_list="\

-  bison

-  cdbs

-  curl

-  dpkg-dev

-  elfutils

-  devscripts

-  fakeroot

-  flex

-  fonts-ipafont

-  fonts-thai-tlwg

-  g++

-  git-core

-  git-svn

-  gperf

-  libasound2-dev

-  libbrlapi-dev

-  libav-tools

-  libbz2-dev

-  libcairo2-dev

-  libcap-dev

-  libcups2-dev

-  libcurl4-gnutls-dev

-  libdrm-dev

-  libelf-dev

-  libffi-dev

-  libgconf2-dev

-  libglib2.0-dev

-  libglu1-mesa-dev

-  libgnome-keyring-dev

-  libgtk2.0-dev

-  libgtk-3-dev

-  libkrb5-dev

-  libnspr4-dev

-  libnss3-dev

-  libpam0g-dev

-  libpci-dev

-  libpulse-dev

-  libsctp-dev

-  libspeechd-dev

-  libsqlite3-dev

-  libssl-dev

-  libudev-dev

-  libwww-perl

-  libxslt1-dev

-  libxss-dev

-  libxt-dev

-  libxtst-dev

-  openbox

-  patch

-  perl

-  pkg-config

-  python

-  python-cherrypy3

-  python-crypto

-  python-dev

-  python-numpy

-  python-opencv

-  python-openssl

-  python-psutil

-  python-yaml

-  rpm

-  ruby

-  subversion

-  ttf-dejavu-core

-  wdiff

-  xcompmgr

-  zip

-  $chromeos_dev_list

-"

+chromeos_dev_list="libbluetooth-dev libpulse-dev"

+

+# Packages need for development

+dev_list="apache2.2-bin bison curl elfutils fakeroot flex g++ gperf

+          language-pack-fr libapache2-mod-php5 libasound2-dev libbz2-dev

+          libcairo2-dev libcups2-dev libcurl4-gnutls-dev libdbus-glib-1-dev

+          libelf-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev

+          libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev

+          libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libsctp-dev

+          libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev

+          libxss-dev libxt-dev libxtst-dev mesa-common-dev patch

+          perl php5-cgi pkg-config python python-cherrypy3 python-dev

+          python-psutil rpm ruby subversion ttf-dejavu-core ttf-indic-fonts

+          ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff git-core

+          $chromeos_dev_list"

 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built

-# NaCl binaries.

-if file -L /sbin/init | grep -q 'ELF 64-bit'; then

+# NaCl binaries. These are always needed, regardless of whether or not we want

+# the full 32-bit "cross-compile" support (--lib32).

+if [ "$(uname -m)" = "x86_64" ]; then

   dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6"

 fi

 # Run-time libraries required by chromeos only

-chromeos_lib_list="libpulse0 libbz2-1.0"

+chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev"

 # Full list of required run-time libraries

-lib_list="\

-  libatk1.0-0

-  libc6

-  libasound2

-  libcairo2

-  libcap2

-  libcups2

-  libexpat1

-  libffi6

-  libfontconfig1

-  libfreetype6

-  libglib2.0-0

-  libgnome-keyring0

-  libgtk2.0-0

-  libgtk-3-0

-  libpam0g

-  libpango1.0-0

-  libpci3

-  libpcre3

-  libpixman-1-0

-  libspeechd2

-  libstdc++6

-  libsqlite3-0

-  libx11-6

-  libx11-xcb1

-  libxau6

-  libxcb1

-  libxcomposite1

-  libxcursor1

-  libxdamage1

-  libxdmcp6

-  libxext6

-  libxfixes3

-  libxi6

-  libxinerama1

-  libxrandr2

-  libxrender1

-  libxtst6

-  zlib1g

-  $chromeos_lib_list

-"

+lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libdbus-glib-1-2

+          libexpat1 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0

+          libgtk2.0-0 libpam0g libpango1.0-0 libpcre3 libpixman-1-0

+          libpng12-0 libstdc++6 libsqlite3-0 libudev0 libx11-6 libxau6 libxcb1

+          libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3

+          libxi6 libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g

+          $chromeos_lib_list"

 # Debugging symbols for all of the run-time libraries

-dbg_list="\

-  libatk1.0-dbg

-  libc6-dbg

-  libcairo2-dbg

-  libffi6-dbg

-  libfontconfig1-dbg

-  libglib2.0-0-dbg

-  libgtk2.0-0-dbg

-  libgtk-3-0-dbg

-  libpango1.0-0-dbg

-  libpcre3-dbg

-  libpixman-1-0-dbg

-  libsqlite3-0-dbg

-  libx11-6-dbg

-  libx11-xcb1-dbg

-  libxau6-dbg

-  libxcb1-dbg

-  libxcomposite1-dbg

-  libxcursor1-dbg

-  libxdamage1-dbg

-  libxdmcp6-dbg

-  libxext6-dbg

-  libxi6-dbg

-  libxinerama1-dbg

-  libxrandr2-dbg

-  libxrender1-dbg

-  libxtst6-dbg

-  zlib1g-dbg

-"

-

-if [[ ! $distro_codename =~ "yakkety" ]]; then

-  dbg_list="${dbg_list} libxfixes3-dbg"

-fi

-

-# Find the proper version of libstdc++6-4.x-dbg.

-if [ "x$distro_codename" = "xtrusty" ]; then

-  dbg_list="${dbg_list} libstdc++6-4.8-dbg"

-else

-  dbg_list="${dbg_list} libstdc++6-4.9-dbg"

-fi

-

-# 32-bit libraries needed e.g. to compile V8 snapshot for Android or armhf

-lib32_list="linux-libc-dev:i386"

-

-# arm cross toolchain packages needed to build chrome on armhf

-EM_REPO="deb http://emdebian.org/tools/debian/ jessie main"

-EM_SOURCE=$(cat <<EOF

-# Repo added by Chromium $0

-${EM_REPO}

-# deb-src http://emdebian.org/tools/debian/ jessie main

-EOF

-)

-EM_ARCHIVE_KEY_FINGER="084C6C6F39159EDB67969AA87DE089671804772E"

-GPP_ARM_PACKAGE="g++-arm-linux-gnueabihf"

-case $distro_codename in

-  jessie)

-    eval $(apt-config shell APT_SOURCESDIR 'Dir::Etc::sourceparts/d')

-    CROSSTOOLS_LIST="${APT_SOURCESDIR}/crosstools.list"

-    arm_list="libc6-dev:armhf

-              linux-libc-dev:armhf"

-    if test "$do_inst_arm" = "1"; then

-      if $(dpkg-query -W ${GPP_ARM_PACKAGE} &>/dev/null); then

-        arm_list+=" ${GPP_ARM_PACKAGE}"

-      else

-        echo "The Debian Cross-toolchains repository is necessary to"

-        echo "cross-compile Chromium for arm."

-        echo -n "Do you want me to add it for you (y/N) "

-        if yes_no 1; then

-          gpg --keyserver pgp.mit.edu --recv-keys ${EM_ARCHIVE_KEY_FINGER}

-          gpg -a --export ${EM_ARCHIVE_KEY_FINGER} | sudo apt-key add -

-          if ! grep "^${EM_REPO}" "${CROSSTOOLS_LIST}" &>/dev/null; then

-            echo "${EM_SOURCE}" | sudo tee -a "${CROSSTOOLS_LIST}" >/dev/null

-          fi

-          arm_list+=" ${GPP_ARM_PACKAGE}"

-        fi

-      fi

-    fi

-    ;;

-  # All necessary ARM packages are available on the default repos on

-  # Debian 9 and later.

-  *)

-    arm_list="binutils-aarch64-linux-gnu

-              libc6-dev-armhf-cross

-              linux-libc-dev-armhf-cross