handled_libraries.add(lib)
if args.undo:
- # Restore original file, and also remove the backup.
- # This is meant to restore the source tree to its original state.
- os.rename(os.path.join(source_tree_root, path + '.orig'),
- os.path.join(source_tree_root, path))
+ try:
+ # Restore original file, and also remove the backup.
+ # This is meant to restore the source tree to its original state.
+ os.rename(os.path.join(source_tree_root, path + '.orig'),
+ os.path.join(source_tree_root, path))
+ except OSError:
+ # .orig file may be not created (when we skip fetching the target
+ # library due to unexpected termination), so just ignore the error.
+ pass
else:
- # Create a backup copy for --undo.
- shutil.copyfile(os.path.join(source_tree_root, path),
- os.path.join(source_tree_root, path + '.orig'))
+ try:
+ # Create a backup copy for --undo.
+ shutil.copyfile(os.path.join(source_tree_root, path),
+ os.path.join(source_tree_root, path + '.orig'))
+ except IOError:
+ # This exception may happen when the target directory does not exist,
+ # which is the case when we skip fetching the third_party library due to unexpected
+ # termination. To proceed even in such case, let's create directory forcibly
+ # to have the configuration file copied.
+ target_dir = os.path.dirname(os.path.join(source_tree_root, path))
+ if not os.path.isdir(target_dir):
+ try:
+ os.makedirs(target_dir)
+ except OSError, e:
+ if e.errno != errno.EEXIST:
+ raise
# Copy the GN file from directory of this script to target path.
- shutil.copyfile(os.path.join(my_dirname, '%s.gn' % lib),
- os.path.join(source_tree_root, path))
+ src = os.path.join(my_dirname, '%s.gn' % lib)
+ dst = os.path.join(source_tree_root, path)
+ print('** use system %s library **' % lib)
+ print(' From %s\n To %s' % (src, dst))
+ shutil.copyfile(src, dst)
+ src = os.path.join(my_dirname, '%s' % lib)
+ # Copy the additional configuration files from directory of this script to target path.
+ if os.path.isdir(src):
+ dst = os.path.join(source_tree_root, 'third_party')
+ os.system("cp -rf " + src + " " + dst)
+ print(' From %s\n To %s' % (src, dst))
unhandled_libraries = set(args.system_libraries) - handled_libraries
if unhandled_libraries:
%setup -q
%build
-
-tizen_src/build/apply_patches.sh
-trap 'tizen_src/build/apply_patches.sh -r' EXIT
-
# architecture related configuration + neon temporary workaround
%if %{?_skip_ninja:0}%{!?_skip_ninja:1}
%ifarch %{arm} aarch64
# The variable chromium-efl_tizen_version and _repository are essentially needed for build.
# Therefore, if the variable is not defined, it explicitly raises exception here.
%define OUTPUT_BASE_FOLDER out.tz_v%{chromium_efl_tizen_version}.%{OUTPUT_BUILD_PROFILE_TARGET}.%{_repository}
-export GYP_GENERATOR_OUTPUT=$PWD/%{OUTPUT_BASE_FOLDER}
+
+export GN_GENERATOR_OUTPUT=$PWD/%{OUTPUT_BASE_FOLDER}
#set build mode
-%if 0%{?_debug_mode}
- %global OUTPUT_FOLDER %{OUTPUT_BASE_FOLDER}/Debug
-%else
- %global OUTPUT_FOLDER %{OUTPUT_BASE_FOLDER}/Release
-%endif
+%global OUTPUT_FOLDER %{OUTPUT_BASE_FOLDER}
%global XWALK_GEN %{OUTPUT_FOLDER}/xwalk_gen
if type ccache &> /dev/null; then
cp -a LICENSE "%{XWALK_GEN}"/LICENSE.chromium
%endif
-#gyp generate
-%if %{?_skip_gyp:0}%{!?_skip_gyp:1}
-#run standard gyp_chromiumefl wrapper
- ./tizen_src/build/gyp_chromiumefl.sh \
- -Dexe_dir="%{CHROMIUM_EXE_DIR}" \
- -Ddata_dir="%{CHROMIUM_DATA_DIR}" \
- -Dedje_dir="%{CHROMIUM_DATA_DIR}"/themes \
- -Dlocale_dir="%{CHROMIUM_LOCALE_DIR}" \
+#gn generate
+#run standard gn_chromiumefl wrapper
+ ./tizen_src/build/gn_chromiumefl.sh \
+ "building_for_tizen_%{OUTPUT_BUILD_PROFILE_TARGET}=true" \
+ "data_dir=\"%{CHROMIUM_DATA_DIR}\"" \
+ "edje_dir=\"%{CHROMIUM_DATA_DIR}/themes\"" \
+ "exe_dir=\"%{CHROMIUM_EXE_DIR}\"" \
+ "locale_dir=\"%{CHROMIUM_LOCALE_DIR}\"" \
+ "tizen_%{OUTPUT_BUILD_PROFILE_TARGET}=true" \
%if 0%{?_remove_webcore_debug_symbols:1}
- -Dremove_webcore_debug_symbols=1 \
+ "remove_webcore_debug_symbols=true" \
%endif
%if 0%{?chromium_efl_tizen_version:1}
- -Dchromium_efl_tizen_version=%{chromium_efl_tizen_version} \
+ "chromium_efl_tizen_version=%{gn_chromium_efl_tizen_version}" \
%endif
%if "%{?_with_wayland}" == "1"
- -Duse_wayland=1 \
+ "use_wayland=true" \
%endif
%if "%{?_repository}" == "emulator" || "%{?_repository}" == "emulator32-x11"
- -Dtizen_emulator_support=1 \
+ "tizen_emulator_support=true" \
%endif
%if 0%{?build_xwalk}
--xwalk \
+++ /dev/null
-. $(dirname $0)/common.sh
-
-function silentApply() {
- PATCH=$(readlink -f $1)
- patch -d ${CHROME_SRC} --forward --reject-file=- -p1 -i $PATCH >/dev/null
- if [ "$?" -gt 0 ]; then
- >&2 echo "failed applying $1"
- fi
-}
-
-function silentDeapply() {
- PATCH=$(readlink -f $1)
- pushd ${CHROME_SRC} > /dev/null
- patch --forward --reject-file=- -p1 --dry-run -i $PATCH >/dev/null
- RET=$?
- if [ "$RET" -gt 1 ]; then
- >&2 echo "failed deapplying $1"
- elif [ "$RET" == "1" ]; then
- # exit status 1 means it's already applied so we revert
- patch -p1 -R --reject-file=- -i $PATCH >/dev/null
- fi
- popd > /dev/null
-}
-
-echo "$@" | grep -q "\-r" && REVERSE=1
-echo "$@" | grep -q "\-\-crosswalk-bin" && CROSSWALK_BIN=1
-
-patchdir=${TOPDIR}/tizen_src/build/patches
-patchset=$patchdir/*.diff
-
-if [ "$CROSSWALK_BIN" == "1" ]; then
- patchset+=" $patchdir/crosswalk/*.diff"
-fi
-
-for patch in $patchset ; do
- if [ -z "$REVERSE" ]; then
- silentApply $patch
- else
- silentDeapply $patch
- fi
-done
parseHostBuildScriptParams desktop $@
JHBUILD_STAMPFILE=""
-if [ "$USE_GN" ]; then
- if [ -z "$GN_GENERATOR_OUTPUT" ]; then
- export GN_GENERATOR_OUTPUT=${TOPDIR}/"out.${host_arch}"
- fi
- JHBUILD_STAMPFILE="${GN_GENERATOR_OUTPUT}/Dependencies/Root/jhbuild.stamp"
-else
- if [ -z "$GYP_GENERATOR_OUTPUT" ]; then
- export GYP_GENERATOR_OUTPUT=${TOPDIR}/"out.${host_arch}"
- fi
- JHBUILD_STAMPFILE="${GYP_GENERATOR_OUTPUT}/Dependencies/Root/jhbuild.stamp"
+if [ -z "$GN_GENERATOR_OUTPUT" ]; then
+ export GN_GENERATOR_OUTPUT=${TOPDIR}/"out.${host_arch}"
fi
+JHBUILD_STAMPFILE="${GN_GENERATOR_OUTPUT}/Dependencies/Root/jhbuild.stamp"
forceJHBuildIfNeeded() {
if [[ $FORCE_JHBUILD == 1 ]]; then
forceJHBuildIfNeeded
JHBUILD_DEPS=""
-if [ "$USE_GN" ]; then
- JHBUILD_DEPS="${GN_GENERATOR_OUTPUT}/Dependencies/Root"
-else
- JHBUILD_DEPS="${GYP_GENERATOR_OUTPUT}/Dependencies/Root"
-fi
+JHBUILD_DEPS="${GN_GENERATOR_OUTPUT}/Dependencies/Root"
if [ "${host_arch}" == "x64" ]; then
_LIBDIR=lib64
elif [ "${host_arch}" == "ia32" ]; then
fi
fi
-${SCRIPTDIR}/apply_patches.sh ${SCRIPTDIR}/patches
-
-if [ "$USE_GN" ]; then
- export __GN_CHROMIUMEFL_TARGET=desktop
-else
- export __GYP_CHROMIUMEFL_TARGET=desktop
-fi
+export __GN_CHROMIUMEFL_TARGET=desktop
#export BUILD_DEPENDENCIES_LIB_PATH="${JHBUILD_DEPS}/${_LIBDIR}"
#export BUILD_DEPENDENCIES_INCLUDE_PATH="${JHBUILD_DEPS}/include"
#done
#deps_include_path="$deps_include_path\""
-if [ "$USE_GN" ]; then
- #hostGnChromiumEfl "deps_include_path=$deps_include_path deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\""
- hostGnChromiumEfl "deps_include_path=\"${JHBUILD_DEPS}/include\" deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\""
+#hostGnChromiumEfl "deps_include_path=$deps_include_path deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\""
+hostGnChromiumEfl "deps_include_path=\"${JHBUILD_DEPS}/include\" deps_lib_path=\"${JHBUILD_DEPS}/${_LIBDIR}\""
# deps_efl_pc_path=\"${JHBUILD_DEPS}/Source/efl-1.16.0/pc\"
-else
- hostGypChromiumEfl
-fi
export LD_LIBRARY_PATH="${JHBUILD_DEPS}/${_LIBDIR}:$LD_LIBRARY_PATH"
export PATH="${JHBUILD_DEPS}/bin:$PATH"
hostNinja desktop
-
-${SCRIPTDIR}/apply_patches.sh -r ${SCRIPTDIR}/patches
--skip-gyp)
export SKIP_GYP=1
;;
- --use-gn)
- export USE_GN=1
- ;;
--skip-gn)
export SKIP_GN=1
;;
if [[ $BUILD_CHROMEDRIVER == 1 ]]; then
TARGETS="$TARGETS chromedriver"
fi
- if [ "$USE_GN" ]; then
- export BUILD_SUBDIRECTORY=""
- BUILDDIR=${GN_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY}
- else
- BUILDDIR=${GYP_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY}
- fi
+ export BUILD_SUBDIRECTORY=""
+ BUILDDIR=${GN_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY}
ninja -C $BUILDDIR ${JOBS} ${TARGETS}
fi
}
count=$(( $count + 1 ))
ARGS[$count]="_skip_gyp 1"
;;
- --use-gn)
- ARGS[$count]=--define
- count=$(( $count + 1 ))
- ARGS[$count]="_use_gn 1"
- ;;
--skip-gn)
ARGS[$count]=--define
count=$(( $count + 1 ))
function preBuild() {
adaptGbsSysrootToCrossCompilation $1
- ${SCRIPTDIR}/apply_patches.sh
}
function postBuild() {
rollbackGbsSysrootChanges $1
- ${SCRIPTDIR}/apply_patches.sh -r
}
if [ -z "$GYP_GENERATOR_OUTPUT" ]; then
function preBuild() {
adaptGbsSysrootToCrossCompilation $1
- ${SCRIPTDIR}/apply_patches.sh
}
function postBuild() {
rollbackGbsSysrootChanges $1
- ${SCRIPTDIR}/apply_patches.sh -r
}
if [ -z "$GYP_GENERATOR_OUTPUT" ]; then
args[arg] += " gcc_version=49" # It should be in condition for arm target
- args.append("--defines=USE_EFL")
- args.append("-v")
-
buildtools_path = os.environ.get('CHROMIUM_BUILDTOOLS_PATH')
host_arch = os.environ.get('HOST_ARCH')
if not buildtools_path:
# it is used for gbs and added target_cpu also.
ADDITIONAL_GN_PARAMETERS+="target_cpu=\"${host_arch}\"
"
- # sysroot=""
- #"
- #no-parallel=true
- #"
- # TODO(b.kelemen): ideally crosscompile should also support system libs.
- # Unfortunately the gbs root doesn't contain everything chromium needs.
-# SYSTEM_DEPS="-Duse_system_expat=true
-# -Duse_system_libjpeg=false
-# -Duse_system_libpng=true
-# -Duse_system_libusb=true
-# -Duse_system_libxml=true
-# -Duse_system_libxslt=true
-# -Duse_system_re2=true
-# -Duse_system_zlib=true
-# "
- SYSTEM_DEPS="" #"--system-libraries
- #libxml
- #"
-
- # [M50_2661] Temporary using the icu of internal chformium instead of system.
- # The icu of system doesn't support utrie2.h
- # FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-967
-# SYSTEM_DEPS+="-Duse_system_icu=false
-# "
-
- if [ "$target" == "mobile" ]; then
-# SYSTEM_DEPS+="-Duse_system_bzip2=true
-# -Duse_system_libexif=true
-# -Duse_system_nspr=true
-# "
- SYSTEM_DEPS+="
- "
- fi
}
add_cross_flags() {
add_cross_flags
fi
fi
- if [ "$SYSTEM_DEPS" != "" ]; then
- #replacing original files with correct ones according to $SYSTEM_DEPS
- $TOPDIR/build/linux/unbundle/replace_gn_files.py $SYSTEM_DEPS
- fi
+fi
+
+if [ "$SYSTEM_DEPS" != "" ]; then
+ echo "** use system lib : replace **"
+ #replacing original files with correct ones according to $SYSTEM_DEPS
+ $TOPDIR/build/linux/unbundle/replace_gn_files.py $SYSTEM_DEPS
fi
_GN_ARGS="
for arg in $_GN_ARGS; do
printf " * ${arg##-D}\n"
done
+for arg in $SYSTEM_DEPS; do
+ printf " * ${arg##-D}\n"
+done
if [ -f "${TOPDIR}/BUILD_.gn" ]; then
rm "${TOPDIR}/BUILD.gn"
mv ${TOPDIR}/BUILD_.gn ${TOPDIR}/BUILD.gn
if [ "$SYSTEM_DEPS" != "" ]; then
+ echo "** use system lib : undo **"
# Restore gn files to their original states not to mess up the tree permanently.
$TOPDIR/build/linux/unbundle/replace_gn_files.py --undo $SYSTEM_DEPS
fi
<repository type="tarball" name="gstreamer"
href="http://gstreamer.freedesktop.org/src/"/>
<repository type="tarball" name="sourceware.org"
- href="ftp://sourceware.org"/>
+ href="http://sourceware.org"/>
+ <repository type="tarball" name="freedesktop.org"
+ href="http://freedesktop.org"/>
+ <repository type="tarball" name="zlib.net"
+ href="http://zlib.net"/>
+
+ <autotools id="at-spi2-core"
+ autogenargs="--disable-introspection">
+ <branch module="pub/GNOME/sources/at-spi2-core/2.10/at-spi2-core-2.10.0.tar.xz" version="2.10.0"
+ repo="ftp.gnome.org"
+ hash="sha256:964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="at-spi2-atk">
+ <branch module="pub/GNOME/sources/at-spi2-atk/2.10/at-spi2-atk-2.10.0.tar.xz" version="2.10.0"
+ repo="ftp.gnome.org"
+ hash="sha256:dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="atk"/>
+ <dep package="at-spi2-core"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="atk"
+ autogen-sh="configure"
+ autogenargs="--disable-introspection">
+ <branch module="pub/GNOME/sources/atk/2.12/atk-2.12.0.tar.xz" version="2.12.0"
+ repo="ftp.gnome.org"
+ hash="sha256:48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f"/>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
<!-- The long and scary "enable-i-really" option is needed to build EFL with disable-pulseaudio and disable-physics options.
Apparently EFL configure script considers such configuration unsupported. Still we don't need audio or physics support
in EFL and building extra libraries just to satisfy dependencies we don't need is pointless. -->
<autotools id="efl" autogen-sh="configure"
- autogenargs="--with-x11=xlib --with-opengl=es --with-glib=yes --disable-pulseaudio --disable-physics
- --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba">
- <branch module="rel/libs/efl/efl-1.16.0.tar.xz" version="1.16.0"
+ autogenargs="--with-x11=xlib --with-opengl=es --with-glib=yes --disable-pulseaudio --disable-physics --enable-egl
+ --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb">
+ <branch module="rel/libs/efl/efl-1.17.0.tar.xz" version="1.17.0"
repo="download.enlightenment.org"
- hash="sha256:7efebbd9964e5daf35c7e978e7cbef25f62ea933a8df73b0c4d287ef65868323"
- md5sum="0552eed3f337a1268aff4a476c6a5fa7">
+ hash="sha256:c13540bad764d014fea2c079fad8fcca62e5c229994d43aa4eb692d2c9b73afe"
+ md5sum="c7cf8478edff3f1342e5f664b347c13c">
</branch>
<dependencies>
<dep package="glib"/>
</autotools>
<autotools id="elementary" autogen-sh="configure"
- autogenargs="--enable-ecore-x">
- <branch module="rel/libs/elementary/elementary-1.16.0.tar.xz" version="1.16.0"
+ autogenargs="--enable-ecore-x --enable-egl --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb">
+ <branch module="rel/libs/elementary/elementary-1.17.0.tar.xz" version="1.17.0"
repo="download.enlightenment.org"
- hash="sha256:483f3cf927edceaec8b61b0e4c0fe5ffbe86f227c7f82e61e8d6f0dbee598694"
- md5sum="317cc2f8f9f18f5473027ba9fa1b000d">
+ hash="sha256:6a6a5883939eab8d87179c7980c0dbd6b53d82bf460a161045a891694d036b2b"
+ md5sum="5d25c429e34da44e6b4ba27cd91ade4d">
</branch>
<dependencies>
<dep package="efl"/>
__extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
modules = [ 'chromeefl-dependencies', ]
-if os.environ['USE_GN']:
- outdir = os.environ.get('GN_GENERATOR_OUTPUT', 'out')
-else:
- outdir = os.environ.get('GYP_GENERATOR_OUTPUT', 'out')
+outdir = os.environ.get('GN_GENERATOR_OUTPUT', 'out')
checkoutroot = os.path.abspath(os.path.join(outdir,'Dependencies', 'Source'))
prefix = os.path.abspath(os.path.join(outdir,'Dependencies', 'Root'))
+++ /dev/null
-Author: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-
-This patch is part of a hack to allow us to split Crosswalk into two separate
-packages, crosswalk-libs (with Chromium shared libraries and all dependencies
-required by Crosswalk itself) and crosswalk-bin (with the Crosswalk binaries).
-
-If passes "--define build_libs 0" to the spec file, crosswalk-libs will not be
-built and we assume it is already installed. This patch is then applied to the
-source tree to make big targets that used to consume a lot of time and CPU by
-generating and building a lot of files do nothing but pass "-l<some_target>" to
-the linker. In other words, we cheat the build system into thinking those
-targets do not need to build anything.
-
-Not all targets can be converted like this, and keeping the patch up-to-date
-across Chromium releases requires manual intervention. Some rules of thumb:
-
-* Only targets whose original type is '<(component)' or 'shared_library' can be
- converted like this. 'static_library' targets are expected to remain static
- (technically it is possible to convert them, but then the hack gets even
- bigger and there is no guarantee that a certain target is expected to work as
- a shared library in the first place). If they are part of a shared library we
- have converted they will not need to be built at all, and if a target in
- Crosswalk itself requires them the static library will need to exist anyway.
-
-* 'direct_dependent_settings' need to be maintained, as targets that depend on
- a converted one still need include paths and other things specified there.
-
-* 'export_depent_settings' and 'all_dependent_settings' need to be preserved
- for the same reason: a target that depends on the converted one may still
- need other libraries that it does not depend on directly. Consequently, this
- means that a certain amount of targets in 'dependencies' also need to be
- kept, since a target must be in the 'dependencies' list to be in
- '*_dependent_settings'.
-
-* 'actions' need to be removed from the original target, as otherwise there is
- more than one target that generates the same files.
-
-* Some target dependencies may be needed even if they are not in one of the
- '*_dependent_settings' lists. For example, targets that generate code, like
- the mojo ones.
-
-* Some gyp files are trickier than others. contents.gyp and skia.gyp, for
- example, get a lot of additional settings from the .gypi files that they
- include. This all needs to be carefully examined when updating the patch.
-
-The best way to make sure the patch still works with a newer Chromium release
-is to call `gbs build' with `--define build_bin 0' first so that only
-crosswalk-libs is generated, then install/upgrade that package and finally call
-`gbs build' with `--define build_libs 0' to build only crosswalk-bin. In the
-best case, everything still builds and the total number of targets is still
-similar to the previous count. If that is not the case, you need to check which
-Crosswalk targets have started depending on others from Chromium and, if
-possible, convert some of them.
-
-BUG=XWALK-2571
---- src/base/base.gyp
-+++ src/base/base.gyp
-@@ -13,6 +13,74 @@
- 'targets': [
- {
- 'target_name': 'base',
-+ 'type': 'none',
-+ 'toolsets': ['host', 'target'],
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lbase',
-+ ],
-+ },
-+ # TODO(gregoryd): direct_dependent_settings should be shared with the
-+ # 64-bit target, but it doesn't work due to a bug in gyp
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '..',
-+ ],
-+ },
-+ 'conditions': [
-+ ['use_glib==1 or <(use_ozone)==1', {
-+ 'dependencies': [
-+ '../build/linux/system.gyp:glib',
-+ ],
-+ 'export_dependent_settings': [
-+ '../build/linux/system.gyp:glib',
-+ ],
-+ }],
-+ ['OS == "linux"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ # We need rt for clock_gettime().
-+ '-lrt',
-+ # For 'native_library_linux.cc'
-+ '-ldl',
-+ ],
-+ },
-+ }],
-+ ],
-+ },
-+ {
-+ 'target_name': 'base_i18n',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lbase_i18n',
-+ ],
-+ },
-+ 'dependencies': [
-+ 'base',
-+ ],
-+ 'export_dependent_settings': [
-+ 'base',
-+ ],
-+ },
-+ {
-+ 'target_name': 'base_prefs',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lbase_prefs',
-+ ],
-+ },
-+ 'dependencies': [
-+ 'base',
-+ ],
-+ 'export_dependent_settings': [
-+ 'base',
-+ ],
-+ },
-+
-+ {
-+ 'target_name': 'base_original',
- 'type': '<(component)',
- 'toolsets': ['host', 'target'],
- 'variables': {
-@@ -256,7 +323,7 @@
- ],
- },
- {
-- 'target_name': 'base_i18n',
-+ 'target_name': 'base_i18n_original',
- 'type': '<(component)',
- 'variables': {
- 'enable_wexit_time_destructors': 1,
-@@ -308,7 +375,7 @@
- ],
- },
- {
-- 'target_name': 'base_prefs',
-+ 'target_name': 'base_prefs_original',
- 'type': '<(component)',
- 'variables': {
- 'enable_wexit_time_destructors': 1,
---- src/cc/cc.gyp
-+++ src/cc/cc.gyp
-@@ -10,6 +10,21 @@
- {
- # GN version: //cc
- 'target_name': 'cc',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lcc',
-+ ],
-+ },
-+ # Include src/gpu for gl2chromium.h.
-+ 'dependencies': [
-+ '../third_party/khronos/khronos.gyp:khronos_headers',
-+ ],
-+ },
-+
-+ {
-+ # GN version: //cc
-+ 'target_name': 'cc_original',
- 'type': '<(component)',
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
---- src/content/content.gyp
-+++ src/content/content.gyp
-@@ -21,6 +21,69 @@
- }],
- ],
- },
-+
-+ 'targets': [
-+ {
-+ # GN version: //content
-+ 'target_name': 'content',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lcontent',
-+ ],
-+ },
-+
-+ 'dependencies': [
-+ '../ui/accessibility/accessibility.gyp:ax_gen',
-+ '../third_party/blink/public/blink_headers.gyp:blink_headers',
-+ '../skia/skia.gyp:skia',
-+
-+ '../device/battery/battery.gyp:device_battery_mojo_bindings',
-+ '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
-+ '../mojo/mojo_base.gyp:mojo_application_bindings',
-+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
-+ '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
-+ '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
-+ 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
-+ ],
-+ 'export_dependent_settings': [
-+ '../ui/accessibility/accessibility.gyp:ax_gen',
-+ # The public content API headers directly include Blink API headers, so we
-+ # have to export the blink header settings so that relative paths in these
-+ # headers resolve correctly.
-+ '../third_party/blink/public/blink_headers.gyp:blink_headers',
-+ # The public render_widget_host.h needs to re-export skia defines.
-+ '../skia/skia.gyp:skia',
-+ 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
-+ ],
-+
-+ 'actions': [
-+ {
-+ 'action_name': 'generate_webkit_version',
-+ 'inputs': [
-+ '<(script)',
-+ '<(lastchange)',
-+ '<(template)',
-+ ],
-+ 'outputs': [
-+ '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h',
-+ ],
-+ 'action': ['python',
-+ '<(script)',
-+ '-f', '<(lastchange)',
-+ '<(template)',
-+ '<@(_outputs)',
-+ ],
-+ 'variables': {
-+ 'script': '<(DEPTH)/build/util/version.py',
-+ 'lastchange': '<(DEPTH)/build/util/LASTCHANGE.blink',
-+ 'template': 'webkit_version.h.in',
-+ },
-+ },
-+ ],
-+ },
-+ ],
-+
- 'conditions': [
- ['OS != "ios"', {
- 'includes': [
-@@ -291,7 +349,7 @@
- 'targets': [
- {
- # GN version: //content
-- 'target_name': 'content',
-+ 'target_name': 'content_original',
- 'type': 'shared_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
---- src/content/content_common.gypi
-+++ src/content/content_common.gypi
-@@ -569,30 +569,6 @@
- '../ui/gl/gl.gyp:gl',
- '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
- ],
-- 'actions': [
-- {
-- 'action_name': 'generate_webkit_version',
-- 'inputs': [
-- '<(script)',
-- '<(lastchange)',
-- '<(template)',
-- ],
-- 'outputs': [
-- '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h',
-- ],
-- 'action': ['python',
-- '<(script)',
-- '-f', '<(lastchange)',
-- '<(template)',
-- '<@(_outputs)',
-- ],
-- 'variables': {
-- 'script': '<(DEPTH)/build/util/version.py',
-- 'lastchange': '<(DEPTH)/build/util/LASTCHANGE.blink',
-- 'template': 'webkit_version.h.in',
-- },
-- },
-- ],
- }],
- ['OS=="mac"', {
- 'dependencies': [
---- src/gpu/gpu.gyp
-+++ src/gpu/gpu.gyp
-@@ -11,6 +11,17 @@
- ],
- 'targets': [
- {
-+ # GN version: //gpu
-+ 'target_name': 'gpu',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lgpu',
-+ ],
-+ },
-+ },
-+
-+ {
- # Library emulates GLES2 using command_buffers.
- # GN version: //gpu/command_buffer/client:gles2_implementation
- 'target_name': 'gles2_implementation',
-@@ -522,7 +533,7 @@
- },
- {
- # GN version: //gpu
-- 'target_name': 'gpu',
-+ 'target_name': 'gpu_original',
- 'type': 'shared_library',
- 'includes': [
- 'command_buffer_client.gypi',
---- src/media/media.gyp
-+++ src/media/media.gyp
-@@ -49,6 +49,22 @@
- {
- # GN version: //media
- 'target_name': 'media',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lmedia',
-+ ],
-+ },
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '..',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //media
-+ 'target_name': 'media_original',
- 'type': '<(component)',
- 'dependencies': [
- '../base/base.gyp:base',
---- src/third_party/mojo/mojo_edk.gyp
-+++ src/third_party/mojo/mojo_edk.gyp
-@@ -10,6 +10,21 @@
- {
- # GN version: //mojo/edk/system
- 'target_name': 'mojo_system_impl',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lmojo_system_impl',
-+ ],
-+ },
-+ 'all_dependent_settings': {
-+ # Ensures that dependent projects import the core functions on Windows.
-+ 'defines': ['MOJO_USE_SYSTEM_IMPL'],
-+ },
-+ },
-+
-+ {
-+ # GN version: //mojo/edk/system
-+ 'target_name': 'mojo_system_original',
- 'type': '<(component)',
- 'dependencies': [
- '../base/base.gyp:base',
---- src/net/net.gyp
-+++ src/net/net.gyp
-@@ -104,6 +104,41 @@
- },
- {
- 'target_name': 'net',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lnet',
-+ ],
-+ },
-+ 'dependencies': [
-+ '../base/base.gyp:base',
-+ ],
-+ 'export_dependent_settings': [
-+ '../base/base.gyp:base',
-+ ],
-+ 'conditions': [
-+ ['use_kerberos==1', {
-+ 'conditions': [
-+ ['linux_link_kerberos==1', {
-+ 'link_settings': {
-+ 'ldflags': [
-+ '<!@(krb5-config --libs gssapi)',
-+ ],
-+ },
-+ }],
-+ ],
-+ }],
-+ ['posix_avoid_mmap==1', {
-+ 'direct_dependent_settings': {
-+ 'defines': [
-+ 'POSIX_AVOID_MMAP',
-+ ],
-+ },
-+ }],
-+ ],
-+ },
-+ {
-+ 'target_name': 'net_original',
- 'dependencies': [
- '../base/base.gyp:base_i18n',
- '../third_party/icu/icu.gyp:icui18n',
-@@ -842,6 +842,15 @@
- 'targets': [
- {
- 'target_name': 'net_with_v8',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lnet_with_v8',
-+ ],
-+ },
-+ },
-+ {
-+ 'target_name': 'net_with_v8_original',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
---- src/ppapi/ppapi_internal.gyp
-+++ src/ppapi/ppapi_internal.gyp
-@@ -35,6 +35,38 @@
- {
- # GN version: //ppapi:ppapi_shared
- 'target_name': 'ppapi_shared',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lppapi_shared',
-+ ],
-+ },
-+ 'dependencies': [
-+ '../base/base.gyp:base',
-+ ],
-+ 'export_dependent_settings': [
-+ '../base/base.gyp:base',
-+ ],
-+ },
-+ {
-+ # GN version: //ppapi:ppapi_proxy
-+ 'target_name': 'ppapi_proxy',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lppapi_proxy',
-+ ],
-+ },
-+ 'all_dependent_settings': {
-+ 'include_dirs': [
-+ '..',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //ppapi:ppapi_shared
-+ 'target_name': 'ppapi_shared_original',
- 'type': '<(component)',
- 'variables': {
- # Set the ppapi_shared_target variable, so that we will pull in the
-@@ -164,7 +196,7 @@
- 'targets': [
- {
- # GN version: //ppapi:ppapi_proxy
-- 'target_name': 'ppapi_proxy',
-+ 'target_name': 'ppapi_proxy_original',
- 'type': 'shared_library',
- 'variables': {
- # Setting both variables means we pull in the sources from both
---- src/skia/skia.gyp
-+++ src/skia/skia.gyp
-@@ -62,7 +62,56 @@
- 'targets': [
- {
- 'target_name': 'skia',
-- 'type': 'shared_library',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lskia',
-+ ],
-+ },
-+ 'direct_dependent_settings': {
-+ 'defines': [
-+ 'SKIA_DLL',
-+ 'GR_GL_IGNORE_ES3_MSAA=0',
-+
-+ # From skia_common.gypi:
-+ # For POSIX platforms, prefer the Mutex implementation provided
-+ # by Skia since it does not generate static initializers.
-+ 'SK_USE_POSIX_THREADS',
-+
-+ '<@(skia_export_defines)',
-+ ],
-+ 'include_dirs': [
-+ #temporary until we can hide SkFontHost
-+ '../third_party/skia/src/core',
-+
-+ '../third_party/skia/include/core',
-+ '../third_party/skia/include/effects',
-+ '../third_party/skia/include/pdf',
-+ '../third_party/skia/include/gpu',
-+ '../third_party/skia/include/lazy',
-+ '../third_party/skia/include/pathops',
-+ '../third_party/skia/include/pipe',
-+ '../third_party/skia/include/ports',
-+ '../third_party/skia/include/utils',
-+ ],
-+ },
-+ 'includes': [
-+ 'skia_common.gypi',
-+ ],
-+
-+ },
-+
-+ {
-+ 'target_name': 'skia_original',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lskia',
-+ ],
-+ },
-+
- 'includes': [
- 'skia_library.gypi',
- 'skia_chrome.gypi',
---- src/storage/storage_browser.gyp
-+++ src/storage/storage_browser.gyp
-@@ -10,6 +10,17 @@
- {
- # GN version: //storage/browser
- 'target_name': 'storage',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lstorage',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //storage/browser
-+ 'target_name': 'storage_original',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
---- src/storage/storage_common.gyp
-+++ src/storage/storage_common.gyp
-@@ -10,6 +10,17 @@
- {
- # GN version: //storage/common
- 'target_name': 'storage_common',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lstorage_common',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //storage/common
-+ 'target_name': 'storage_common_original',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
---- src/sync/sync.gyp
-+++ src/sync/sync.gyp
-@@ -27,12 +27,27 @@
- 'sync_proto',
- ],
- },
-+ {
-+ 'target_name': 'sync_core',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lsync_core',
-+ ],
-+ },
-+ 'dependencies': [
-+ 'sync_proto',
-+ ],
-+ 'export_dependent_settings': [
-+ 'sync_proto',
-+ ],
-+ },
-
- # Contains everything related to sync implementation that does not depend
- # on chrome/ or components/. Do not depend on this directly. Depend on
- # the 'sync' target to get the sync protobufs, too.
- {
-- 'target_name': 'sync_core',
-+ 'target_name': 'sync_core_original',
- 'type': '<(component)',
- 'variables': { 'enable_wexit_time_desctructors': 1, },
- 'defines': [
---- src/third_party/blink/public/blink.gyp
-+++ src/third_party/blink/public/blink.gyp
-@@ -36,17 +36,18 @@
- # GN version: //third_party/blink/public:blink
- 'target_name': 'blink',
- 'type': 'none',
-- 'dependencies': [
-- '../Source/platform/blink_platform.gyp:blink_platform',
-- '../Source/web/web.gyp:blink_web',
-- 'blink_headers.gyp:blink_headers',
-- 'blink_minimal',
-- ],
-- 'export_dependent_settings': [
-- '../Source/web/web.gyp:blink_web',
-- '../Source/platform/blink_platform.gyp:blink_platform',
-- 'blink_minimal',
-- ],
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '..',
-+ ],
-+ },
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lblink_common',
-+ '-lblink_web',
-+ '-lblink_platform',
-+ ],
-+ },
- },
- {
- # This target provides a minimal set of Blink APIs such as WebString to use in
---- src/third_party/angle/src/compiler.gypi
-+++ src/third_party/angle/src/compiler.gypi
-@@ -236,6 +236,16 @@
-
- {
- 'target_name': 'translator',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-ltranslator',
-+ ],
-+ },
-+ },
-+
-+ {
-+ 'target_name': 'translator_original',
- 'type': '<(component)',
- 'dependencies': [ 'translator_lib' ],
- 'includes': [ '../build/common_defines.gypi', ],
---- src/third_party/ffmpeg/ffmpeg.gyp
-+++ src/third_party/ffmpeg/ffmpeg.gyp
-@@ -168,6 +168,27 @@
-
- 'targets': [{
- 'target_name': 'ffmpeg',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lffmpeg',
-+ ],
-+ },
-+ 'variables': {
-+ # Path to platform configuration files.
-+ 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
-+ },
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '../..', # The chromium 'src' directory.
-+ '<(platform_config_root)',
-+ '.',
-+ ],
-+ },
-+ },
-+
-+ {
-+ 'target_name': 'ffmpeg_original',
- 'type': '<(ffmpeg_component)',
- 'variables': {
- # Path to platform configuration files.
---- src/third_party/icu/icu.gyp
-+++ src/third_party/icu/icu.gyp
-@@ -171,6 +171,37 @@
- },
- {
- 'target_name': 'icui18n',
-+ 'type': 'none',
-+ 'toolsets': ['host', 'target'],
-+ 'link_settings': {
-+ 'libraries': [
-+ '-licui18n',
-+ ],
-+ },
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ 'source/i18n',
-+ ],
-+ },
-+ },
-+ {
-+ 'target_name': 'icuuc',
-+ 'type': 'none',
-+ 'toolsets': ['host', 'target'],
-+ 'link_settings': {
-+ 'libraries': [
-+ '-licuuc',
-+ ],
-+ },
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ 'source/common',
-+ ],
-+ },
-+ },
-+
-+ {
-+ 'target_name': 'icui18n_original',
- 'type': '<(component)',
- 'sources': [
- '<@(icui18n_sources)',
-@@ -259,7 +288,7 @@
- ], # conditions
- },
- {
-- 'target_name': 'icuuc',
-+ 'target_name': 'icuuc_original',
- 'type': '<(component)',
- 'sources': [
- '<@(icuuc_sources)',
---- src/ui/aura/aura.gyp
-+++ src/ui/aura/aura.gyp
-@@ -10,6 +10,17 @@
- {
- # GN version: //ui/aura
- 'target_name': 'aura',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-laura',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //ui/aura
-+ 'target_name': 'aura_original',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
---- src/ui/base/ui_base.gyp
-+++ src/ui/base/ui_base.gyp
-@@ -10,6 +10,25 @@
- {
- # GN version: //ui/base
- 'target_name': 'ui_base',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lui_base',
-+ ],
-+ },
-+ 'dependencies': [
-+ '../../net/net.gyp:net',
-+ '../gfx/gfx.gyp:gfx',
-+ ],
-+ 'export_dependent_settings': [
-+ '../../net/net.gyp:net',
-+ '../gfx/gfx.gyp:gfx',
-+ ],
-+ },
-+
-+ {
-+ # GN version: //ui/base
-+ 'target_name': 'ui_base_original',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
---- src/ui/gfx/gfx.gyp
-+++ src/ui/gfx/gfx.gyp
-@@ -8,6 +8,26 @@
- },
- 'targets': [
- {
-+ 'target_name': 'gfx',
-+ 'type': 'none',
-+ 'dependencies': [
-+ '<(DEPTH)/skia/skia.gyp:skia',
-+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ ],
-+ 'export_dependent_settings': [
-+ '<(DEPTH)/skia/skia.gyp:skia',
-+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
-+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
-+ ],
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lgfx',
-+ ],
-+ },
-+ },
-+
-+ {
- 'target_name': 'gfx_geometry',
- 'type': '<(component)',
- 'dependencies': [
-@@ -69,7 +89,7 @@
- ],
- },
- {
-- 'target_name': 'gfx',
-+ 'target_name': 'gfx_original',
- 'type': '<(component)',
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
---- src/ui/gl/gl.gyp
-+++ src/ui/gl/gl.gyp
-@@ -10,6 +10,25 @@
- 'targets': [
- {
- 'target_name': 'gl',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lgl_wrapper',
-+ ],
-+ },
-+ 'product_name': 'gl_wrapper', # Avoid colliding with OS X's libGL.dylib
-+ 'dependencies': [
-+ '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
-+ ],
-+ 'variables': {
-+ 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
-+ },
-+ 'export_dependent_settings': [
-+ '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
-+ ],
-+ },
-+ {
-+ 'target_name': 'gl_original',
- 'type': '<(component)',
- 'product_name': 'gl_wrapper', # Avoid colliding with OS X's libGL.dylib
- 'dependencies': [
---- src/ui/views/views.gyp
-+++ src/ui/views/views.gyp
-@@ -570,6 +570,23 @@
- {
- # GN version: //ui/views
- 'target_name': 'views',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lviews',
-+ ],
-+ },
-+ 'dependencies': [
-+ '../accessibility/accessibility.gyp:ax_gen',
-+ ],
-+ 'export_dependent_settings': [
-+ '../accessibility/accessibility.gyp:ax_gen',
-+ ],
-+ }, # target_name: views
-+
-+ {
-+ # GN version: //ui/views
-+ 'target_name': 'views_original',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
---- src/ui/wm/wm.gyp
-+++ src/ui/wm/wm.gyp
-@@ -10,6 +10,17 @@
- {
- # GN version: //ui/wm
- 'target_name': 'wm',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lwm',
-+ ],
-+ },
-+ },
-+
-+ {
-+ # GN version: //ui/wm
-+ 'target_name': 'wm_original',
- 'type': '<(component)',
- 'dependencies': [
- '../../base/base.gyp:base',
---- src/v8/tools/gyp/v8.gyp
-+++ src/v8/tools/gyp/v8.gyp
-@@ -35,6 +35,21 @@
- 'targets': [
- {
- 'target_name': 'v8',
-+ 'type': 'none',
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lv8',
-+ ],
-+ },
-+ 'direct_dependent_settings': {
-+ 'include_dirs': [
-+ '../../include',
-+ ],
-+ },
-+ },
-+
-+ {
-+ 'target_name': 'v8_original',
- 'dependencies_traverse': 1,
- 'conditions': [
- ['want_separate_host_toolset==1', {
+++ /dev/null
-diff --git a/third_party/ffmpeg/ffmpeg_generated.gni b/third_party/ffmpeg/ffmpeg_generated.gni
-index e952679..d0208c7 100644
---- a/third_party/ffmpeg/ffmpeg_generated.gni
-+++ b/third_party/ffmpeg/ffmpeg_generated.gni
-@@ -12,7 +12,7 @@ ffmpeg_c_sources = []
- ffmpeg_gas_sources = []
- ffmpeg_yasm_sources = []
-
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/allcodecs.c",
- "libavcodec/autorename_libavcodec_utils.c",
-@@ -146,7 +146,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "C
- ]
- }
-
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/h264pred.c",
- "libavcodec/hpeldsp.c",
-@@ -167,7 +167,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "C
- ]
- }
-
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/aac_ac3_parser.c",
- "libavcodec/aac_parser.c",
-@@ -255,7 +255,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chr
- ]
- }
-
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/arm/fft_fixed_init_arm.c",
- "libavcodec/arm/fft_init_arm.c",
-@@ -282,7 +282,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chr
- ]
- }
-
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/arm/h264pred_init_arm.c",
- "libavcodec/arm/hpeldsp_init_arm.c",
-@@ -302,7 +302,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chr
- ]
- }
-
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_tizen && arm_use_neon)) {
- ffmpeg_c_sources += [
- "libavutil/arm/float_dsp_init_neon.c",
- ]
-@@ -361,7 +361,7 @@ if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_l
- ]
- }
-
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || is_tizen) {
- ffmpeg_c_sources += [
- "libavcodec/arm/aacpsdsp_init_arm.c",
- "libavcodec/arm/mpegaudiodsp_init_arm.c",
-@@ -483,7 +483,7 @@ if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chr
- ]
- }
-
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_tizen && arm_use_neon)) {
- ffmpeg_c_sources += [
- "libavcodec/arm/hpeldsp_init_neon.c",
- "libavcodec/arm/vp8dsp_init_neon.c",
-diff --git a/third_party/ffmpeg/ffmpeg_options.gni b/third_party/ffmpeg/ffmpeg_options.gni
-index 6bb719a..44735d6 100644
---- a/third_party/ffmpeg/ffmpeg_options.gni
-+++ b/third_party/ffmpeg/ffmpeg_options.gni
-@@ -47,8 +47,10 @@ assert(ffmpeg_branding == "Chromium" ||
-
- if (current_cpu == "x86") {
- ffmpeg_arch = "ia32"
--} else if (current_cpu == "arm" && arm_version >= 7 && arm_use_neon) {
-+} else if ((current_cpu == "arm" || is_tizen) && arm_version >= 7 && arm_use_neon) {
- ffmpeg_arch = "arm-neon"
-+} else if (is_tizen) {
-+ ffmpeg_arch = "arm"
- } else {
- ffmpeg_arch = current_cpu
- }
-@@ -61,6 +63,6 @@ os_config = current_os
- if ((is_linux || is_chromeos) && is_msan) {
- os_config = "linux-noasm"
- disable_ffmpeg_asm = true
--} else if (is_chromeos) {
-+} else if (is_chromeos || is_tizen) {
- os_config = "linux"
- }
+++ /dev/null
-diff --git a/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c b/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
-index 40ff9ff..c641ab0 100644
---- a/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
-+++ b/third_party/mesa/src/chromium_gensrc/mesa/glcpp-parse.c
-@@ -4005,12 +4005,12 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
- * unexpanded token. */
- char *str;
- token_list_t *expansion;
-- token_t *final;
-+ token_t *final_token;
-
- str = ralloc_strdup (parser, token->value.str);
-- final = _token_create_str (parser, OTHER, str);
-+ final_token = _token_create_str (parser, OTHER, str);
- expansion = _token_list_create (parser);
-- _token_list_append (expansion, final);
-+ _token_list_append (expansion, final_token);
- *last = node;
- return expansion;
- }
-diff --git a/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y b/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
-index 8025c06..a19dc15 100644
---- a/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
-+++ b/third_party/mesa/src/src/glsl/glcpp/glcpp-parse.y
-@@ -1538,12 +1538,12 @@ _glcpp_parser_expand_node (glcpp_parser_t *parser,
- * unexpanded token. */
- char *str;
- token_list_t *expansion;
-- token_t *final;
-+ token_t *final_token;
-
- str = ralloc_strdup (parser, token->value.str);
-- final = _token_create_str (parser, OTHER, str);
-+ final_token = _token_create_str (parser, OTHER, str);
- expansion = _token_list_create (parser);
-- _token_list_append (expansion, final);
-+ _token_list_append (expansion, final_token);
- *last = node;
- return expansion;
- }
-
+++ /dev/null
-diff --git a/tools/grit/grit/node/include.py b/tools/grit/grit/node/include.py
-index 4bad785..94e5e7a 100755
---- a/tools/grit/grit/node/include.py
-+++ b/tools/grit/grit/node/include.py
-@@ -100,10 +100,13 @@ class IncludeNode(base.Node):
- # We only use rsyncable compression on Linux.
- # We exclude ChromeOS since ChromeOS bots are Linux based but do not have
- # the --rsyncable option built in for gzip. See crbug.com/617950.
-- if sys.platform == 'linux2' and 'chromeos' not in self.GetRoot().defines:
-- data = grit.format.gzip_string.GzipStringRsyncable(data)
-- else:
-- data = grit.format.gzip_string.GzipString(data)
-+# [M53_2785] We cannot use the rsyncable compression since 'chromium-efl' do not
-+# have the --rsyncable option built in for gzip.
-+# FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-2059
-+# if sys.platform == 'linux2' and 'chromeos' not in self.GetRoot().defines:
-+# data = grit.format.gzip_string.GzipStringRsyncable(data)
-+# else:
-+ data = grit.format.gzip_string.GzipString(data)
- data = self.RESERVED_HEADER[0] + data
- elif data[:3] == self.RESERVED_HEADER:
- # We are reserving these 3 bytes as the header for gzipped files in the
+++ /dev/null
-diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 140e2fc..426bd43 100644
---- a/content/renderer/render_view_impl.cc
-+++ b/content/renderer/render_view_impl.cc
-@@ -208,6 +208,7 @@
- #endif
-
- #if defined(USE_EFL)
-+#include "content/renderer/android/disambiguation_popup_helper.h"
- #include "content/renderer/android/email_detector.h"
- #include "content/renderer/android/phone_number_detector.h"
- #include "ui/gfx/device_display_info_efl.h"
-@@ -3272,6 +3273,12 @@ bool RenderViewImpl::didTapMultipleTargets(
- // The touch_rect, target_rects and zoom_rect are in the outer viewport
- // reference frame.
- gfx::Rect zoom_rect;
-+#if !defined(EWK_BRINGUP)
-+// [M53_2785] The path of "DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor"
-+// is changed to "content/renderer/android/disambiguation_popup_helper.h"
-+// from "content/renderer/disambiguation_popup_helper.h".
-+// It will be fixed by webview team.
-+// FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-2057
- float new_total_scale =
- #if defined(S_TERRACE_SUPPORT)
- DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor(
-@@ -3285,6 +3292,9 @@ bool RenderViewImpl::didTapMultipleTargets(
- gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(),
- device_scale_factor_ * webview()->pageScaleFactor(), &zoom_rect);
- #endif
-+#else
-+ float new_total_scale;
-+#endif // EWK_BRINGUP
- if (!new_total_scale || zoom_rect.IsEmpty())
- return false;
-
+++ /dev/null
-webrtc.diff
- double slash (//) in include path leads to rpm error, fixed by patch
- See: http://107.108.218.239/bugzilla/show_bug.cgi?id=6458
- TODO(b.kelemen): upstream
projects / platform / framework / web / chromium-efl.git / commitdiff