diff --git a/DEPS b/DEPS index 338c509faf..135707a845 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'c086b4e24d6c6649f99743e46df87f7761dd31d1', + 'chromium_revision': '4664fe0d123f948bafa7b942717fc5847e61971c', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 2978b56fff..fdcfdaad23 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -8,7 +8,6 @@ # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. -import("//build/config/arm.gni") import("//build/config/crypto.gni") import("//build/config/linux/pkg_config.gni") import("build/webrtc.gni") @@ -150,7 +149,7 @@ config("common_config") { } else { cflags += [ "-msoft-float" ] } - if (mips_arch_variant == "mips32r2") { + if (mips_arch_variant == "r2") { defines += [ "MIPS32_R2_LE" ] cflags += [ "-mips32r2" ] cflags_cc += [ "-mips32r2" ] diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index 8e489a3794..6459dae0ae 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -7,6 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. import("//build/config/arm.gni") +import("//build/config/mips.gni") declare_args() { # Assume Chromium build for now, since that's the priority case for getting GN @@ -53,9 +54,8 @@ declare_args() { # Enable to use the Mozilla internal settings. build_with_mozilla = false - # Define MIPS architecture variant, MIPS DSP variant and MIPS FPU - # This may be subject to change in accordance to Chromium's MIPS flags - mips_arch_variant = "mips32r1" + # Define MIPS DSP variant and MIPS FPU. + # This may be subject to change in accordance to Chromium's MIPS flags. mips_dsp_rev = 0 mips_fpu = true