From 27a77e45688eecede192fd0d220950986c92e1b8 Mon Sep 17 00:00:00 2001
From: Adam Barth <github@adambarth.com>
Date: Mon, 1 Aug 2016 14:32:51 -0700
Subject: [PATCH] Add //lib/ftl (#2846)

This patch starts the process of porting Flutter to run on Fuchsia by
adding FTL to DEPS. We will eventually replace //base with //lib/ftl.
---
 DEPS                        | 20 ++++++++++++++++++++
 build/config/BUILDCONFIG.gn | 11 +++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/DEPS b/DEPS
index fbd93d2ce..83759ddbe 100644
--- a/DEPS
+++ b/DEPS
@@ -19,6 +19,7 @@
 
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
+  'fuchsia_git': 'https://fuchsia.googlesource.com',
   'mojo_sdk_revision': 'b200aa62c93647a0421b9239804ef5ce1509ab20',
   'base_revision': '672b04e54b937ec899429a6bd5409c5a6300d151',
   'skia_revision': 'd1bdd1fcbd308afb9903f39d231742f5c951cf07',
@@ -37,16 +38,35 @@ vars = {
 # If you need to add a new host, contact chrome infrastructure team.
 allowed_hosts = [
   'chromium.googlesource.com',
+  'fuchsia.googlesource.com',
   'github.com',
 ]
 
 deps = {
+   # Fuchsia compatibility
+   #
+   # The dependencies in this section should match the layout in the Fuchsia gn
+   # build. Eventually, we'll manage these dependencies together with Fuchsia
+   # and not have to specific specific hashes.
+
+  'src/lib/ftl':
+   Var('fuchsia_git') + '/ftl' + '@' + 'f9b68c2007cc11069bb5abadcf757f1dc61c51ea',
+
+  'src/third_party/gtest':
+   Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72',
+
+   # Chromium-style
+   #
+   # As part of integrating with Fuchsia, we should eventually remove all these
+   # Chromium-style dependencies.
+
   'src/base':
    Var('chromium_git') + '/external/github.com/domokit/base' + '@' +  Var('base_revision'),
 
   'src/buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
 
+  # TODO(abarth): Remove in favor of //third_party/gtest
   'src/testing/gtest':
    Var('chromium_git') + '/external/googletest.git' + '@' + '23574bf2333f834ff665f894c97bef8a5b33a0a9',
 
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index e22b29aa6..89af55fb3 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -177,6 +177,7 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = false
   is_mac = false
@@ -187,6 +188,7 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = false
   is_mac = true
@@ -197,6 +199,7 @@ if (current_os == "win") {
   is_android = true
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = false
   is_mac = false
@@ -207,6 +210,7 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = true
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = true
   is_mac = false
@@ -220,6 +224,7 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = false
   is_mac = false
@@ -230,6 +235,7 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = true
   is_linux = false
   is_mac = false
@@ -240,16 +246,17 @@ if (current_os == "win") {
   is_android = false
   is_chromeos = false
   is_fnl = false
+  is_fuchsia = false
   is_ios = false
   is_linux = true
   is_mac = false
   is_nacl = false
   is_posix = true
   is_win = false
-} else if (current_os == "fnl") {
+} else if (current_os == "fuchsia") {
   is_android = false
   is_chromeos = false
-  is_fnl = true
+  is_fuchsia = true
   is_ios = false
   is_linux = true
   is_mac = false
-- 
GitLab