From d6cb6b983200e9a238a0c904c37b9cec38acb07b Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Thu, 12 Sep 2019 17:01:51 -0700
Subject: [PATCH] Remove last @export tag (#3010)

* Remove last @export tag
---
 core/msg.js              | 11 +++++++++--
 tests/compile/compile.sh |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/msg.js b/core/msg.js
index 7533d234d..b294be4b6 100644
--- a/core/msg.js
+++ b/core/msg.js
@@ -30,9 +30,16 @@
  */
 goog.provide('Blockly.Msg');
 
+goog.require('Blockly.utils.global');
+
+
 /**
  * Exported so that if Blockly is compiled with ADVANCED_COMPILATION,
  * the Blockly.Msg object exists for message files included in script tags.
- * @export
  */
-Blockly.Msg = {};
+if (!Blockly.utils.global['Blockly']) {
+  Blockly.utils.global['Blockly'] = {};
+}
+if (!Blockly.utils.global['Blockly']['Msg']) {
+  Blockly.utils.global['Blockly']['Msg'] = Blockly.Msg;
+}
diff --git a/tests/compile/compile.sh b/tests/compile/compile.sh
index cd4c92c8c..f6136a9bc 100755
--- a/tests/compile/compile.sh
+++ b/tests/compile/compile.sh
@@ -78,7 +78,6 @@ COMPILATION_COMMAND="java -jar $COMPILER --js='$BLOCKLY_ROOT/tests/compile/main.
   --js='$BLOCKLY_ROOT/blocks/**.js' \
   --js='$BLOCKLY_ROOT/generators/**.js' \
   --js='$BLOCKLY_ROOT/msg/js/**.js' \
-  --js='$BLOCKLY_ROOT/closure/goog/base.js' \
   --generate_exports \
   --externs $BLOCKLY_ROOT/externs/svg-externs.js \
   --compilation_level ADVANCED_OPTIMIZATIONS \