diff --git a/BUILD.gn b/BUILD.gn
index 599b35dae54885f7c4558b48c8c8c4993345e490..93dfa9ccc9df540fe5f2538267b489a12c349aae 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,7 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 group("make_temp_test") {
   testonly = true
   deps = []
diff --git a/examples/distributedb/test/BUILD.gn b/examples/distributedb/test/BUILD.gn
index 0bf3b10b0fe7c0a4bdb1babe3784cf4786c72d28..9aafa82bfd2195ca9e5919e601def9371c139a5a 100755
--- a/examples/distributedb/test/BUILD.gn
+++ b/examples/distributedb/test/BUILD.gn
@@ -47,7 +47,7 @@ ohos_distributedtest("DistributeDemo") {
     "hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   deps = [
@@ -69,7 +69,7 @@ ohos_distributedtest("DistributeDemoAgent") {
     "hilog_native:libhilog",
     "ipc:ipc_core",
     "safwk:system_ability_fwk",
-    "samgr_standard:samgr_proxy",
+    "samgr:samgr_proxy",
   ]
 
   deps = [
diff --git a/third_party/lib/cpp/BUILD.gn b/third_party/lib/cpp/BUILD.gn
index 88987943ac5a67b81946effab3847960de3a7388..8c879eaa99af8fe2d05167cd3fb19a1343b08e1b 100755
--- a/third_party/lib/cpp/BUILD.gn
+++ b/third_party/lib/cpp/BUILD.gn
@@ -23,8 +23,8 @@ config("gtest_config") {
 static_library("gtest") {
   #testonly = true
   public = [
-    "//third_party/googletest/googletest/include/gtest/gtest.h",
     "//third_party/googletest/googletest/include/gtest/gtest-spi.h",
+    "//third_party/googletest/googletest/include/gtest/gtest.h",
   ]
   sources = [
     "//third_party/googletest/googletest/include/gtest/gtest-death-test.h",
@@ -35,6 +35,10 @@ static_library("gtest") {
     "//third_party/googletest/googletest/include/gtest/gtest-typed-test.h",
     "//third_party/googletest/googletest/include/gtest/gtest_pred_impl.h",
     "//third_party/googletest/googletest/include/gtest/gtest_prod.h",
+    "//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h",
+    "//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h",
+    "//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h",
+    "//third_party/googletest/googletest/include/gtest/hwext/utils.h",
     "//third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h",
     "//third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h",
     "//third_party/googletest/googletest/include/gtest/internal/custom/gtest.h",
@@ -49,10 +53,6 @@ static_library("gtest") {
     "//third_party/googletest/googletest/include/gtest/internal/gtest-string.h",
     "//third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h",
     "//third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h",
-    "//third_party/googletest/googletest/include/gtest/hwext/gtest-ext.h",
-    "//third_party/googletest/googletest/include/gtest/hwext/gtest-filter.h",
-    "//third_party/googletest/googletest/include/gtest/hwext/gtest-tag.h",
-    "//third_party/googletest/googletest/include/gtest/hwext/utils.h",
     "//third_party/googletest/googletest/src/gtest-death-test.cc",
     "//third_party/googletest/googletest/src/gtest-filepath.cc",
     "//third_party/googletest/googletest/src/gtest-internal-inl.h",
@@ -73,12 +73,6 @@ static_library("gtest") {
 
 static_library("gtest_main") {
   #testonly = true
-  sources = [
-    "//third_party/googletest/googletest/src/gtest_main.cc",
-  ]
-  public_deps = [
-    ":gtest",
-  ]
+  sources = [ "//third_party/googletest/googletest/src/gtest_main.cc" ]
+  public_deps = [ ":gtest" ]
 }
-
-