Merge branch 'master' of github.com:flutter/engine into 26380

Author: Kaushik Iska

DEPS

@@ -23,15 +23,15 @@ vars = {
   'fuchsia_git': 'https://fuchsia.googlesource.com',
   'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
-  'skia_revision': '3f42e98f461af6f9022fa3fd3f3ab98b34dd81c3',
+  'skia_revision': '70ebd9ca0616f54450a38d4f0f952810595a441b',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '011a1239fc4c0ed140ddce4773cc791da1936cd4',
+  'dart_revision': '71bee8f05eb40e2f3b49ed57b8f46421f4432179',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -116,7 +116,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '19317704cfb7be72c7d81953f634674ea8bee5ea',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '13ca742ec8b3d7761877197d74b003d3e646d805',
 
    # Fuchsia compatibility
    #

ci/licenses_golden/licenses_flutter

@@ -396,6 +396,7 @@ FILE: ../../../flutter/shell/platform/android/android_context_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_context_gl.h
 FILE: ../../../flutter/shell/platform/android/android_environment_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_environment_gl.h
+FILE: ../../../flutter/shell/platform/android/android_exports.lst
 FILE: ../../../flutter/shell/platform/android/android_external_texture_gl.cc
 FILE: ../../../flutter/shell/platform/android/android_external_texture_gl.h
 FILE: ../../../flutter/shell/platform/android/android_native_window.cc

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: ac0db7893a7157f0a715889abf470568
+Signature: 9fbc0d30a3a9de96a9a329b406654e52
 
 UNUSED LICENSES:
 

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 7732a4b1a615c93a42144e598900f9ac
+Signature: 8c93c6ef0de9e89d30fad2c99c899a75
 
 UNUSED LICENSES:
 

common/settings.h

@@ -105,6 +105,7 @@ struct Settings {
   bool verbose_logging = false;
   std::string log_tag = "flutter";
   std::string icu_data_path;
+  MappingCallback icu_mapper;
 
   // Assets settings
   fml::UniqueFD::element_type assets_dir =

fml/icu_util.cc

@@ -10,6 +10,7 @@
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/native_library.h"
 #include "flutter/fml/paths.h"
 #include "third_party/icu/source/common/unicode/udata.h"
 
@@ -22,6 +23,10 @@ class ICUContext {
     valid_ = SetupMapping(icu_data_path) && SetupICU();
   }
 
+  ICUContext(std::unique_ptr<Mapping> mapping) : mapping_(std::move(mapping)) {
+    valid_ = SetupICU();
+  }
+
   ~ICUContext() = default;
 
   bool SetupMapping(const std::string& icu_data_path) {
@@ -99,5 +104,17 @@ void InitializeICU(const std::string& icu_data_path) {
                  [&icu_data_path]() { InitializeICUOnce(icu_data_path); });
 }
 
+void InitializeICUFromMappingOnce(std::unique_ptr<Mapping> mapping) {
+  static ICUContext* context = new ICUContext(std::move(mapping));
+  FML_CHECK(context->IsValid())
+      << "Unable to initialize the ICU context from a mapping.";
+}
+
+void InitializeICUFromMapping(std::unique_ptr<Mapping> mapping) {
+  std::call_once(g_icu_init_flag, [mapping = std::move(mapping)]() mutable {
+    InitializeICUFromMappingOnce(std::move(mapping));
+  });
+}
+
 }  // namespace icu
 }  // namespace fml

fml/icu_util.h

@@ -8,12 +8,15 @@
 #include <string>
 
 #include "flutter/fml/macros.h"
+#include "flutter/fml/mapping.h"
 
 namespace fml {
 namespace icu {
 
 void InitializeICU(const std::string& icu_data_path = "");
 
+void InitializeICUFromMapping(std::unique_ptr<Mapping> mapping);
+
 }  // namespace icu
 }  // namespace fml