From f221912051bf1e7e92b38ac5655957c5f03af7f3 Mon Sep 17 00:00:00 2001
From: Jacob Gravelle <jgravelle@google.com>
Date: Wed, 18 Jul 2018 09:42:25 -0700
Subject: [PATCH] Move upstream- prefix from tool id to version

---
 emsdk_manifest.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index 7f1d00b..9d67bb1 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -176,8 +176,8 @@
     "cmake_build_type": "Release"
   },
   {
-    "id": "upstream-clang",
-    "version": "%waterfall-lkgr%",
+    "id": "clang",
+    "version": "upstream-%waterfall-lkgr%",
     "bitness": 64,
     "linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
     "install_path": "upstream/%waterfall-lkgr%",
@@ -185,8 +185,8 @@
     "activated_cfg": "LLVM_ROOT='%installation_dir%/bin'"
   },
   {
-    "id": "upstream-emscripten",
-    "version": "%waterfall-lkgr%",
+    "id": "emscripten",
+    "version": "upstream-%waterfall-lkgr%",
     "bitness": 64,
     "linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
     "install_path": "upstream/%waterfall-lkgr%",
@@ -194,8 +194,8 @@
     "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%/emscripten'"
   },
   {
-    "id": "upstream-binaryen",
-    "version": "%waterfall-lkgr%",
+    "id": "binaryen",
+    "version": "upstream-%waterfall-lkgr%",
     "bitness": 64,
     "linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
     "install_path": "upstream/%waterfall-lkgr%",
@@ -1629,7 +1629,7 @@
   {
     "version": "upstream-%waterfall-lkgr%",
     "bitness": 64,
-    "uses": ["upstream-clang-%waterfall-lkgr%-64bit", "upstream-emscripten-%waterfall-lkgr%-64bit", "upstream-binaryen-%waterfall-lkgr%-64bit"],
+    "uses": ["clang-upstream-%waterfall-lkgr%-64bit", "emscripten-upstream-%waterfall-lkgr%-64bit", "binaryen-upstream-%waterfall-lkgr%-64bit"],
     "os": "linux"
   }
   ]