Roll tonic to da66b94839f788a0bffc34fd9bdfef3360af8c18. (flutter#4332)

Update to moved repository. Issue flutter/flutter#9998
agd · Nov 8, 2017 · d615678 · d615678
1 parent 8ad42f0
commit d615678
Show file tree

Hide file tree

Showing 4 changed files with 1,093 additions and 7 deletions.
diff --git a/DEPS b/DEPS
@@ -125,8 +125,8 @@ deps = {
   'src/garnet':
    Var('fuchsia_git') + '/garnet' + '@' + '73eeb0583e7967016ad7386a90353bf6937488b9',
 
-  'src/topaz/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '1facca9652dc97facd64e18217a6175c4236e354',
+  'src/topaz':
+   Var('fuchsia_git') + '/topaz' + '@' + 'da66b94839f788a0bffc34fd9bdfef3360af8c18',
 
   'src/third_party/benchmark':
    Var('fuchsia_git') + '/third_party/benchmark' + '@' + '296537bc48d380adf21567c5d736ab79f5363d22',

diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -2205,6 +2205,44 @@ class RepositoryGarnetFidlDirectory extends RepositoryDirectory {
   }
 }
 
+class RepositoryTopazDirectory extends RepositoryDirectory {
+  RepositoryTopazDirectory(RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+      return entry.name != 'tools'
+          && super.shouldRecurse(entry);
+  }
+
+  @override
+  RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'shell')
+      return new RepositoryTopazShellDirectory(this, entry);
+    return super.createSubdirectory(entry);
+  }
+}
+
+class RepositoryTopazShellDirectory extends RepositoryDirectory {
+  RepositoryTopazShellDirectory(RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  RepositoryDirectory createSubdirectory(fs.Directory entry) {
+    if (entry.name == 'third_party')
+      return new RepositoryTopazShellThirdPartyDirectory(this, entry);
+    return super.createSubdirectory(entry);
+  }
+}
+
+class RepositoryTopazShellThirdPartyDirectory extends RepositoryDirectory {
+  RepositoryTopazShellThirdPartyDirectory(RepositoryDirectory parent, fs.Directory io) : super(parent, io);
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+      return entry.name != 'QR-Code-generator'
+          && super.shouldRecurse(entry);
+  }
+}
+
 class RepositoryRoot extends RepositoryDirectory {
   RepositoryRoot(fs.Directory io) : super(null, io);
 
@@ -2241,6 +2279,8 @@ class RepositoryRoot extends RepositoryDirectory {
       return new RepositoryFlutterDirectory(this, entry);
     if (entry.name == 'garnet')
       return new RepositoryGarnetDirectory(this, entry);
+    if (entry.name == 'topaz')
+      return new RepositoryTopazDirectory(this, entry);
     return super.createSubdirectory(entry);
   }
 }

diff --git a/travis/licenses_golden/licenses_flutter b/travis/licenses_golden/licenses_flutter
@@ -9517,7 +9517,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: engine
-ORIGIN: ../../../topaz/lib/tonic/LICENSE
+ORIGIN: ../../../topaz/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../flutter/fml/memory/weak_ptr.h
 FILE: ../../../flutter/fml/memory/weak_ptr_internal.cc