DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert base roll and its fallout.

Browse Source 
Updating base turns out to be more complicated than I thought.

This reverts commit 17772b0dcc5f5fc45dadc8a29180948cd0543b59.
This reverts commit c38428c7b98951e2cccf6b38881eabd87786da49.
This reverts commit bcda2c934f6038920bb45204efac4c0967c926ea.
This commit is contained in:
Adam Barth 2016-06-15 17:29:58 -07:00
parent 17772b0dcc
commit cf5fe9a01b
9 changed files with 1812 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DEPS
View File

@ -20,7 +20,7 @@
vars = {
'chromium_git': 'https://chromium.googlesource.com',
'mojo_sdk_revision': 'fbe912aa65e0346382bc1e2874eb88fa3aad3358',
'base_revision': 'ff0b4b505e01de0098fd6ed13cf6661fa58be851',
'base_revision': '672b04e54b937ec899429a6bd5409c5a6300d151',
'skia_revision': '8cc209111876b7c78b5ec577c9221d8ed5e21024',
# Note: When updating the Dart revision, ensure that all entries that are
@ -30,7 +30,7 @@ vars = {
'dart_observatory_packages_revision': 'cf90eb9077177d3d6b3fd5e8289477c2385c026a',
'dart_root_certificates_revision': 'aed07942ce98507d2be28cbd29e879525410c7fc',
'buildtools_revision': '222bd42ce39d1bd8f08fe089b066f49c469e1cdf',
'buildtools_revision': '565d04e8741429fb1b4f26d102f2c6c3b849edeb',
}
# Only these hosts are allowed for dependencies in this DEPS file.
@ -42,19 +42,19 @@ allowed_hosts = [
deps = {
'src/base':
'https://github.com/domokit/base.git' + '@' + Var('base_revision'),
Var('chromium_git') + '/external/github.com/domokit/base' + '@' + Var('base_revision'),
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
'src/testing/gtest':
Var('chromium_git') + '/external/googletest.git' + '@' + '9855a87157778d39b95eccfb201a9dc90f6d61c6',
Var('chromium_git') + '/external/googletest.git' + '@' + '23574bf2333f834ff665f894c97bef8a5b33a0a9',
'src/testing/gmock':
Var('chromium_git') + '/external/googlemock.git' + '@' + '0421b6f358139f02e102c9c332ce19a33faf75be',
Var('chromium_git') + '/external/googlemock.git' + '@' + '29763965ab52f24565299976b936d1265cb6a271',
'src/third_party/icu':
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '94e4b770ce2f6065d4261d29c32683a6099b9d93',
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c3f79166089e5360c09e3053fce50e6e296c3204',
'src/dart':
Var('chromium_git') + '/external/github.com/dart-lang/sdk.git' + '@' + Var('dart_revision'),
@ -80,7 +80,7 @@ deps = {
Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'),
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '7da28c6c7c6a1387217352ce02b31754deb54d2a',
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '4671120cd8558ce62ee8672ebf3eb6f5216f909b',
'src/third_party/libjpeg_turbo':
Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git' + '@' + 'f4631b6ee8b1dbb05e51ae335a7886f9ac598ab6',

14
engine/src/flutter/build/secondary/testing/gtest/BUILD.gn
View File

@ -20,6 +20,10 @@ config("gtest_config") {
# Gtest headers need to be able to find themselves.
include_dirs = [ "include" ]
if (is_win) {
cflags = [ "/wd4800" ] # Unused variable warning.
}
if (is_posix) {
defines += [
# gtest isn't able to figure out when RTTI is disabled for gcc
@ -107,6 +111,16 @@ static_library("gtest") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
config("gtest_warnings") {
if (is_win && is_clang) {
# The Mutex constructor initializer list in gtest-port.cc is incorrectly
# ordered. See
# https://groups.google.com/d/msg/googletestframework/S5uSV8L2TX8/U1FaTDa6J6sJ.
cflags = [ "-Wno-reorder" ]
}
}
configs += [ ":gtest_warnings" ]
}
source_set("gtest_main") {

9
engine/src/flutter/build/secondary/third_party/android_tools/BUILD.gn vendored
View File

@ -28,8 +28,11 @@ android_java_prebuilt("uiautomator_java") {
jar_path = "$android_sdk/uiautomator.jar"
}
android_java_prebuilt("android_support_annotations_javalib") {
jar_path = "$android_sdk_root/extras/android/support/annotations/android-support-annotations.jar"
}
java_prebuilt("android_support_multidex_java") {
supports_android = true
jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/android-support-multidex.jar"
}
@ -64,8 +67,8 @@ android_resources("android_support_v7_mediarouter_resources") {
android_java_prebuilt("android_support_v7_mediarouter_java") {
deps = [
":android_support_v7_appcompat_java",
":android_support_v7_mediarouter_resources",
":android_support_v7_appcompat_java",
]
jar_path = "$android_sdk_root/extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
}
@ -93,7 +96,9 @@ android_resources("google_play_services_default_resources") {
android_java_prebuilt("google_play_services_default_java") {
deps = [
":android_support_v13_java",
":android_support_v7_mediarouter_java",
":google_play_services_default_resources",
]
proguard_preprocess = false
jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
}

391
engine/src/flutter/build/secondary/third_party/libsrtp/BUILD.gn vendored Normal file
View File

@ -0,0 +1,391 @@
# Copyright 2014 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.
declare_args() {
use_system_libsrtp = false
use_srtp_boringssl = true
}
config("libsrtp_config") {
defines = [
"HAVE_CONFIG_H",
"HAVE_STDLIB_H",
"HAVE_STRING_H",
"TESTAPP_SOURCE",
]
include_dirs = [
"config",
"srtp/include",
"srtp/crypto/include",
]
if (use_srtp_boringssl) {
defines += [ "OPENSSL" ]
}
if (is_posix) {
defines += [
"HAVE_INT16_T",
"HAVE_INT32_T",
"HAVE_INT8_T",
"HAVE_UINT16_T",
"HAVE_UINT32_T",
"HAVE_UINT64_T",
"HAVE_UINT8_T",
"HAVE_STDINT_H",
"HAVE_INTTYPES_H",
"HAVE_NETINET_IN_H",
"HAVE_ARPA_INET_H",
"HAVE_UNISTD_H",
]
cflags = [ "-Wno-unused-variable" ]
}
if (is_win) {
defines += [
"HAVE_BYTESWAP_METHODS_H",
# All Windows architectures are this way.
"SIZEOF_UNSIGNED_LONG=4",
"SIZEOF_UNSIGNED_LONG_LONG=8",
]
}
if (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm") {
defines += [
# TODO(leozwang): CPU_RISC doesn"t work properly on android/arm
# platform for unknown reasons, need to investigate the root cause
# of it. CPU_RISC is used for optimization only, and CPU_CISC should
# just work just fine, it has been tested on android/arm with srtp
# test applications and libjingle.
"CPU_CISC",
]
}
if (current_cpu == "mipsel") {
defines += [ "CPU_RISC" ]
}
}
config("system_libsrtp_config") {
defines = [ "USE_SYSTEM_LIBSRTP" ]
include_dirs = [ "/usr/include/srtp" ]
}
if (use_system_libsrtp) {
group("libsrtp") {
public_configs = [
":libsrtp_config",
":system_libsrtp_config",
]
libs = [ "-lsrtp" ]
}
} else {
static_library("libsrtp") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
public_configs = [ ":libsrtp_config" ]
sources = [
# includes
"srtp/include/ekt.h",
"srtp/include/getopt_s.h",
"srtp/include/rtp.h",
"srtp/include/rtp_priv.h",
"srtp/include/srtp.h",
"srtp/include/srtp_priv.h",
"srtp/include/ut_sim.h",
# headers
"srtp/crypto/include/aes.h",
"srtp/crypto/include/aes_cbc.h",
"srtp/crypto/include/aes_icm.h",
"srtp/crypto/include/alloc.h",
"srtp/crypto/include/auth.h",
"srtp/crypto/include/cipher.h",
"srtp/crypto/include/crypto.h",
"srtp/crypto/include/crypto_kernel.h",
"srtp/crypto/include/crypto_math.h",
"srtp/crypto/include/crypto_types.h",
"srtp/crypto/include/cryptoalg.h",
"srtp/crypto/include/datatypes.h",
"srtp/crypto/include/err.h",
"srtp/crypto/include/gf2_8.h",
"srtp/crypto/include/hmac.h",
"srtp/crypto/include/integers.h",
"srtp/crypto/include/kernel_compat.h",
"srtp/crypto/include/key.h",
"srtp/crypto/include/null_auth.h",
"srtp/crypto/include/null_cipher.h",
"srtp/crypto/include/prng.h",
"srtp/crypto/include/rand_source.h",
"srtp/crypto/include/rdb.h",
"srtp/crypto/include/rdbx.h",
"srtp/crypto/include/sha1.h",
"srtp/crypto/include/stat.h",
"srtp/crypto/include/xfm.h",
# sources
"srtp/crypto/cipher/aes.c",
"srtp/crypto/cipher/aes_cbc.c",
"srtp/crypto/cipher/aes_icm.c",
"srtp/crypto/cipher/cipher.c",
"srtp/crypto/cipher/null_cipher.c",
"srtp/crypto/hash/auth.c",
"srtp/crypto/hash/hmac.c",
"srtp/crypto/hash/null_auth.c",
"srtp/crypto/hash/sha1.c",
"srtp/crypto/kernel/alloc.c",
"srtp/crypto/kernel/crypto_kernel.c",
"srtp/crypto/kernel/err.c",
"srtp/crypto/kernel/key.c",
"srtp/crypto/math/datatypes.c",
"srtp/crypto/math/gf2_8.c",
"srtp/crypto/math/stat.c",
"srtp/crypto/replay/rdb.c",
"srtp/crypto/replay/rdbx.c",
"srtp/crypto/replay/ut_sim.c",
"srtp/crypto/rng/ctr_prng.c",
"srtp/crypto/rng/prng.c",
"srtp/crypto/rng/rand_source.c",
"srtp/srtp/ekt.c",
"srtp/srtp/srtp.c",
]
if (is_clang) {
cflags = [ "-Wno-implicit-function-declaration" ]
}
if (use_srtp_boringssl) {
deps = [
"//third_party/boringssl:boringssl",
]
public_deps = [
"//third_party/boringssl:boringssl",
]
sources -= [
"srtp/crypto/cipher/aes_cbc.c",
"srtp/crypto/cipher/aes_icm.c",
"srtp/crypto/hash/hmac.c",
"srtp/crypto/hash/sha1.c",
"srtp/crypto/rng/ctr_prng.c",
"srtp/crypto/rng/prng.c",
]
sources += [
"srtp/crypto/cipher/aes_gcm_ossl.c",
"srtp/crypto/cipher/aes_icm_ossl.c",
"srtp/crypto/hash/hmac_ossl.c",
"srtp/crypto/include/aes_gcm_ossl.h",
"srtp/crypto/include/aes_icm_ossl.h",
]
}
}
# TODO(GYP): A bunch of these tests don't compile (in gyp either). They're
# not very broken, so could probably be made to work if it's useful.
if (!is_win) {
executable("rdbx_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/include/getopt_s.h",
"srtp/test/getopt_s.c",
"srtp/test/rdbx_driver.c",
]
}
executable("srtp_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/include/getopt_s.h",
"srtp/include/srtp_priv.h",
"srtp/test/getopt_s.c",
"srtp/test/srtp_driver.c",
]
}
executable("roc_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/include/rdbx.h",
"srtp/include/ut_sim.h",
"srtp/test/roc_driver.c",
]
}
executable("replay_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/include/rdbx.h",
"srtp/include/ut_sim.h",
"srtp/test/replay_driver.c",
]
}
executable("rtpw") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/include/datatypes.h",
"srtp/include/getopt_s.h",
"srtp/include/rtp.h",
"srtp/include/srtp.h",
"srtp/test/getopt_s.c",
"srtp/test/rtp.c",
"srtp/test/rtpw.c",
]
if (is_android) {
defines = [ "HAVE_SYS_SOCKET_H" ]
}
if (is_clang) {
cflags = [ "-Wno-implicit-function-declaration" ]
}
}
executable("srtp_test_cipher_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/cipher_driver.c",
"srtp/include/getopt_s.h",
"srtp/test/getopt_s.c",
]
}
executable("srtp_test_datatypes_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/datatypes_driver.c",
]
}
executable("srtp_test_stat_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/stat_driver.c",
]
}
executable("srtp_test_sha1_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/sha1_driver.c",
]
}
executable("srtp_test_kernel_driver") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/kernel_driver.c",
"srtp/include/getopt_s.h",
"srtp/test/getopt_s.c",
]
}
executable("srtp_test_aes_calc") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/aes_calc.c",
]
}
executable("srtp_test_rand_gen") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/rand_gen.c",
"srtp/include/getopt_s.h",
"srtp/test/getopt_s.c",
]
}
executable("srtp_test_rand_gen_soak") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/rand_gen_soak.c",
"srtp/include/getopt_s.h",
"srtp/test/getopt_s.c",
]
}
executable("srtp_test_env") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
":libsrtp",
]
sources = [
"srtp/crypto/test/env.c",
]
}
group("srtp_runtest") {
deps = [
":rdbx_driver",
":srtp_driver",
":roc_driver",
":replay_driver",
":rtpw",
":srtp_test_cipher_driver",
":srtp_test_datatypes_driver",
":srtp_test_stat_driver",
":srtp_test_sha1_driver",
":srtp_test_kernel_driver",
":srtp_test_aes_calc",
":srtp_test_rand_gen",
":srtp_test_rand_gen_soak",
":srtp_test_env",
]
}
}
}

1211
engine/src/flutter/build/secondary/third_party/nss/BUILD.gn vendored Normal file
View File

File diff suppressed because it is too large Load Diff

173
engine/src/flutter/build/secondary/tools/grit/grit_rule.gni
View File

@ -11,11 +11,10 @@
# Path to .grd file.
#
# outputs (required)
# List of outputs from grit, relative to the target_gen_dir. If supplied,
# a call to Grit to compute the outputs can be skipped which will make
# GN run faster. Grit will verify at build time that this list is correct
# and will fail if there is a mismatch between the outputs specified by
# the .grd file and the outputs list here.
# List of outputs from grit, relative to the target_gen_dir. Grit will
# verify at build time that this list is correct and will fail if there
# is a mismatch between the outputs specified by the .grd file and the
# outputs list here.
#
# To get this list, you can look in the .grd file for
# <output filename="..." and put those filename here. The base directory
@ -50,6 +49,10 @@
# output_dir, but if multiple targets with the same name end up in
# the same output_dir, they can collide.
#
# depfile_dir (optional)
# If set, used to store the depfile and corresponding stamp file.
# Defaults to output_dir
#
# use_qualified_include (optional)
# If set, output_dir is not added to include_dirs.
#
@ -76,6 +79,7 @@
# # files.
# }
import("//build/config/chrome_build.gni")
import("//build/config/crypto.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
@ -106,6 +110,15 @@ if (is_chrome_branded) {
]
}
if (is_chromeos) {
grit_defines += [
"-D",
"chromeos",
"-D",
"scale_factors=2x",
]
}
if (is_desktop_linux) {
grit_defines += [
"-D",
@ -113,6 +126,34 @@ if (is_desktop_linux) {
]
}
if (toolkit_views) {
grit_defines += [
"-D",
"toolkit_views",
]
}
if (use_aura) {
grit_defines += [
"-D",
"use_aura",
]
}
if (use_ash) {
grit_defines += [
"-D",
"use_ash",
]
}
if (use_nss_certs) {
grit_defines += [
"-D",
"use_nss_certs",
]
}
if (use_ozone) {
grit_defines += [
"-D",
@ -120,6 +161,20 @@ if (use_ozone) {
]
}
if (enable_image_loader_extension) {
grit_defines += [
"-D",
"image_loader_extension",
]
}
if (enable_remoting) {
grit_defines += [
"-D",
"remoting",
]
}
if (is_android) {
grit_defines += [
"-t",
@ -147,6 +202,106 @@ if (is_ios) {
]
}
if (enable_extensions) {
grit_defines += [
"-D",
"enable_extensions",
]
}
if (enable_media_router) {
grit_defines += [
"-D",
"enable_media_router",
]
}
if (enable_plugins) {
grit_defines += [
"-D",
"enable_plugins",
]
}
if (enable_basic_printing || enable_print_preview) {
grit_defines += [
"-D",
"enable_printing",
]
if (enable_print_preview) {
grit_defines += [
"-D",
"enable_print_preview",
]
}
}
if (enable_themes) {
grit_defines += [
"-D",
"enable_themes",
]
}
if (enable_app_list) {
grit_defines += [
"-D",
"enable_app_list",
]
}
if (enable_settings_app) {
grit_defines += [
"-D",
"enable_settings_app",
]
}
if (enable_google_now) {
grit_defines += [
"-D",
"enable_google_now",
]
}
# Note: use_concatenated_impulse_responses is omitted. It is never used and
# should probably be removed from GYP build.
if (enable_webrtc) {
grit_defines += [
"-D",
"enable_webrtc",
]
}
if (enable_hangout_services_extension) {
grit_defines += [
"-D",
"enable_hangout_services_extension",
]
}
if (enable_task_manager) {
grit_defines += [
"-D",
"enable_task_manager",
]
}
if (enable_notifications) {
grit_defines += [
"-D",
"enable_notifications",
]
}
if (enable_wifi_bootstrapping) {
grit_defines += [
"-D",
"enable_wifi_bootstrapping",
]
}
if (enable_service_discovery) {
grit_defines += [
"-D",
"enable_service_discovery",
]
}
if (mac_views_browser) {
grit_defines += [
"-D",
"mac_views_browser",
]
}
grit_resource_id_file = "//tools/gritsettings/resource_ids"
grit_info_script = "//tools/grit/grit_info.py"
@ -179,6 +334,12 @@ template("grit") {
grit_output_name = target_name
}
if (defined(invoker.depfile_dir)) {
depfile_dir = invoker.depfile_dir
} else {
depfile_dir = output_dir
}
# These are all passed as arguments to the script so have to be relative to
# the build directory.
if (resource_ids != "") {
@ -231,7 +392,7 @@ template("grit") {
script = "//tools/grit/grit.py"
inputs = grit_inputs
depfile = "$output_dir/${grit_output_name}_stamp.d"
depfile = "$depfile_dir/${grit_output_name}_stamp.d"
outputs = [ "${depfile}.stamp" ] + grit_outputs
args = [

2
engine/src/flutter/sky/dist/BUILD.gn vendored
View File

@ -22,7 +22,7 @@ copy("sky_shell") {
]
deps = [
"//sky/shell:shell_application_struct",
"//sky/shell",
]
} else if (!is_ios) {
sources = [

24
engine/src/flutter/sky/tools/sky_snapshot/loader.cc
View File

@ -20,9 +20,9 @@ namespace {
// Extract the scheme prefix ('package:' or 'file:' from )
static std::string ExtractSchemePrefix(std::string url) {
if (base::StartsWith(url, "package:", base::CompareCase::SENSITIVE)) {
if (base::StartsWithASCII(url, "package:", true)) {
return "package:";
} else if (base::StartsWith(url, "file:", base::CompareCase::SENSITIVE)) {
} else if (base::StartsWithASCII(url, "file:", true)) {
return "file:";
}
return "";
@ -30,9 +30,9 @@ static std::string ExtractSchemePrefix(std::string url) {
// Extract the path from a package: or file: url.
static std::string ExtractPath(std::string url) {
if (base::StartsWith(url, "package:", base::CompareCase::SENSITIVE)) {
if (base::StartsWithASCII(url, "package:", true)) {
base::ReplaceFirstSubstringAfterOffset(&url, 0, "package:", "");
} else if (base::StartsWith(url, "file:", base::CompareCase::SENSITIVE)) {
} else if (base::StartsWithASCII(url, "file:", true)) {
base::ReplaceFirstSubstringAfterOffset(&url, 0, "file:", "");
}
return url;
@ -107,11 +107,11 @@ void Loader::LoadPackagesMap(const base::FilePath& packages) {
Dart_Handle Loader::CanonicalizeURL(Dart_Handle library, Dart_Handle url) {
std::string string = StringFromDart(url);
if (base::StartsWith(string, "dart:", base::CompareCase::SENSITIVE))
if (base::StartsWithASCII(string, "dart:", true))
return url;
if (base::StartsWith(string, "package:", base::CompareCase::SENSITIVE))
if (base::StartsWithASCII(string, "package:", true))
return url;
if (base::StartsWith(string, "file:", base::CompareCase::SENSITIVE)) {
if (base::StartsWithASCII(string, "file:", true)) {
base::ReplaceFirstSubstringAfterOffset(&string, 0, "file:", "");
return StringToDart(string);;
}
@ -126,9 +126,9 @@ Dart_Handle Loader::CanonicalizeURL(Dart_Handle library, Dart_Handle url) {
}
std::string Loader::GetFilePathForURL(std::string url) {
if (base::StartsWith(url, "package:", base::CompareCase::SENSITIVE))
if (base::StartsWithASCII(url, "package:", true))
return GetFilePathForPackageURL(url);
if (base::StartsWith(url, "file:", base::CompareCase::SENSITIVE))
if (base::StartsWithASCII(url, "file:", true))
return GetFilePathForFileURL(url);
return url;
@ -136,7 +136,7 @@ std::string Loader::GetFilePathForURL(std::string url) {
std::string Loader::GetFilePathForPackageURL(
std::string url) {
DCHECK(base::StartsWith(url, "package:", base::CompareCase::SENSITIVE));
DCHECK(base::StartsWithASCII(url, "package:", true));
base::ReplaceFirstSubstringAfterOffset(&url, 0, "package:", "");
size_t slash = url.find('/');
if (slash == std::string::npos)
@ -146,7 +146,7 @@ std::string Loader::GetFilePathForPackageURL(
std::string package_path = packages_map_->Resolve(package);
if (package_path.empty())
return std::string();
if (base::StartsWith(package_path, "file://", base::CompareCase::SENSITIVE)) {
if (base::StartsWithASCII(package_path, "file://", true)) {
base::ReplaceFirstSubstringAfterOffset(&package_path, 0, "file://", "");
return package_path + library_path;
}
@ -155,7 +155,7 @@ std::string Loader::GetFilePathForPackageURL(
}
std::string Loader::GetFilePathForFileURL(std::string url) {
DCHECK(base::StartsWith(url, "file://", base::CompareCase::SENSITIVE));
DCHECK(base::StartsWithASCII(url, "file://", true));
base::ReplaceFirstSubstringAfterOffset(&url, 0, "file://", "");
return url;
}

4
engine/src/flutter/third_party/BUILD.gn vendored
View File

@ -31,12 +31,12 @@ group("jpeg") {
libs = [ "jpeg" ]
public_configs = [ ":system_libjpeg_config" ]
} else if (use_libjpeg_turbo) {
public_deps = [
deps = [
"//third_party/libjpeg_turbo:libjpeg",
]
public_configs = [ ":libjpeg_turbo_config" ]
} else {
public_deps = [
deps = [
"//third_party/libjpeg:libjpeg",
]
}