diff --git a/BUILD.gn b/BUILD.gn
index 07b7815..773df00 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -203,11 +203,19 @@
       configs += [ ":icu_code" ]
       configs += extra_configs
       public_configs = [ ":icu_config" ]
+
+      # Make icu into a standalone static library. Currently This is only useful
+      # on Chrome OS.
+      if (invoker.check_thin_archive && icu_disable_thin_archive) {
+        configs -= [ "//build/config/compiler:thin_archive" ]
+        complete_static_lib = true
+      }
     }
   }
 }
 
 template("generate_icui18n") {
+  check_thin_archive = true
   generate_icu_component(target_name) {
     assert(defined(invoker.icuuc_deps), "Need the 'icuuc_deps' parameter.")
     icuuc_deps = invoker.icuuc_deps
@@ -229,13 +237,6 @@
 
     defines = [ "U_I18N_IMPLEMENTATION" ]
     deps = icuuc_deps
-
-    # Make icu into a standalone static library. Currently This is only useful on
-    # Chrome OS.
-    if (icu_disable_thin_archive) {
-      configs -= [ "//build/config/compiler:thin_archive" ]
-      complete_static_lib = true
-    }
   }
 }
 
@@ -253,6 +254,7 @@
 }
 
 template("generate_icuuc") {
+  check_thin_archive = false
   generate_icu_component(target_name) {
     fuchsia_output_name_postfix = ""
     if (defined(invoker.fuchsia_output_name_postfix)) {