commit c21cd7f900ef1ba235e6f81531da90c2001dd385
author Dave Bort <dbort@google.com> Mon Sep 17 16:02:21 2018 -0700
committer Dave Bort <dbort@google.com> Mon Sep 17 16:17:54 2018 -0700
tree a07484166bb39ff0fc65c3ea4b91cc6d12f4d5e1
parent 03533e54a077e89b3836f4e805f5c40281c7b46a

[manifest] Change the garnet import name to make jiri happy

The <import> name needs to match the corresponding <project> name in the
imported manifest. Without this, jiri seems to download garnet@master
instead of the pinned version.

Test: jiri init/import/update locally with --local-manifest
Bug: INTK-592
Change-Id: Icd0601b9958436d1af64eeb175efb88e12d25890

manifest/ffmpeg

diff --git a/manifest/ffmpeg b/manifest/ffmpeg
index 4edcae0..adc5ae7 100644
--- a/manifest/ffmpeg
+++ b/manifest/ffmpeg
@@ -4,7 +4,7 @@
     <!-- TODO(jamesr): Remove, it should be possible to build things without garnet -->
     <import remote="https://fuchsia.googlesource.com/garnet"
             manifest="manifest/minimal"
-            name="minimal"
+            name="garnet"
             revision="8aa4ce8a3382d9e8c87016d4acb165df3f6710bd"/>
     <import remote="https://fuchsia.googlesource.com/build"
             manifest="manifest/build"