回退googletest部件依赖

Signed-off-by: zhangdd_ewan <zhangdongdong50@huawei.com>

bundle.json

@@ -59,7 +59,6 @@
                 "config_policy",
                 "c_utils",
                 "eventhandler",
-                "googletest",
                 "hilog",
                 "icu",
                 "init",

frameworks/intl/test/BUILD.gn

@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//base/global/i18n/i18n.gni")
 import("//build/test.gni")
 
 module_output_path = "i18n/intl_test"
@@ -50,13 +49,11 @@ ohos_unittest("intl_test") {
     "libpng:libpng",
     "openssl:libssl_shared",
   ]
-  if (i18n_testonly) {
-    external_deps += [ "googletest:gtest" ]
-  }
 
   deps = [
     "//base/global/i18n/frameworks/intl:build_module",
     "//base/global/i18n/services:i18n_sa_client",
+    "//third_party/googletest:gtest_main"
   ]
 }
 

frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn

@@ -35,7 +35,11 @@ ohos_fuzztest("PhoneNumberMatchedFuzzTest") {
   configs = []
 
   deps = [ "../../../../intl:intl_util" ]
-  external_deps = [ "libphonenumber:phonenumber_standard" ]
+  external_deps = [
+    "icu:shared_icui18n",
+    "icu:shared_icuuc",
+    "libphonenumber:phonenumber_standard"
+  ]
 
   subsystem_name = "global"
   part_name = "i18n"

frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn

@@ -35,6 +35,10 @@ ohos_fuzztest("RulesEngineFuzzTest") {
   configs = []
 
   deps = [ "../../../../intl:intl_util" ]
+  external_deps = [
+    "icu:shared_icui18n",
+    "icu:shared_icuuc",
+  ]
 
   subsystem_name = "global"
   part_name = "i18n"

frameworks/zone/test/BUILD.gn

@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//base/global/i18n/i18n.gni")
 import("//build/test.gni")
 
 module_output_path = "i18n/zone_util_test"
@@ -22,12 +21,12 @@ ohos_unittest("zone_util_test") {
   sources = [ "unittest/zone_util_test.cpp" ]
   include_dirs =
       [ "//base/global/i18n/interfaces/native/inner_api/zone/include" ]
-  deps = [ "//base/global/i18n/frameworks/zone:zone_util" ]
+  deps = [
+    "//base/global/i18n/frameworks/zone:zone_util",
+    "//third_party/googletest:gtest_main"
+  ]
   external_deps = [
     "c_utils:utils",
     "libphonenumber:phonenumber_standard",
   ]
-  if (i18n_testonly) {
-    external_deps += [ "googletest:gtest" ]
-  }
 }

i18n.gni

@@ -14,5 +14,4 @@
 declare_args() {
   i18n_support_ui = true
   i18n_support_app_preferred_language = true
-  i18n_testonly = true
 }

services/test/BUILD.gn

@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//base/global/i18n/i18n.gni")
 import("//build/test.gni")
 
 module_output_path = "i18n/i18n_service_test"
@@ -33,14 +32,12 @@ ohos_unittest("i18n_service_test") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
   ]
-  if (i18n_testonly) {
-    external_deps += [ "googletest:gtest" ]
-  }
 
   deps = [
     "../../frameworks/intl:build_module",
     "../../services:i18n_sa",
     "../../services:i18n_sa_client",
+    "//third_party/googletest:gtest_main"
   ]
 
   defines = [ "SUPPORT_GRAPHICS" ]