Fix embedded icu data on Windows

The symbol currently defined in the generated assembly does not match
what the linker expects.

Also remove the outdated special case for is_win.

R=jshin@chromium.org

Bug: chromium:938223
Change-Id: I2c2d3a16df7fa7f6801d70cdf4a80e99e2572f2f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/1599430
Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 261d43a..b3144ca 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1060,11 +1060,12 @@
 
   public_configs = [ ":icu_config" ]
 
-  if (is_win || icu_use_data_file) {
+  if (icu_use_data_file) {
     sources += [ "source/stubdata/stubdata.cpp" ]
-    defines += [ "U_ICUDATAENTRY_IN_COMMON" ]
   }
 
+  defines += [ "U_ICUDATAENTRY_IN_COMMON" ]
+
   if (is_fuchsia) {
     # Fuchsia puts its own libicuuc.so in /system/lib where we need to put our
     # .so when doing component builds, so we need to give this a different name.
diff --git a/scripts/make_data_assembly.py b/scripts/make_data_assembly.py
index eb2bf72..94b07c8 100755
--- a/scripts/make_data_assembly.py
+++ b/scripts/make_data_assembly.py
@@ -60,10 +60,10 @@
                "\t.align 4\n"
                "_icudt%s_dat:\n" %tuple([version_number] * 3))
 elif options.win:
-  output.write(".globl icudt%s_dat\n"
+  output.write(".globl _icudt%s_dat\n"
                "\t.section .rdata\n"
                "\t.balign 16\n"
-               "icudt%s_dat:\n" % tuple([version_number] * 2))
+               "_icudt%s_dat:\n" % tuple([version_number] * 2))
 else:
   output.write(".globl icudt%s_dat\n"
                "\t.section .note.GNU-stack,\"\",%%progbits\n"