From b97fa4186389c3701d38bfdddf0506c9bcd3b06f Mon Sep 17 00:00:00 2001
From: limingkang <limingkang1@huawei.com>
Date: Tue, 15 Oct 2024 09:54:38 +0800
Subject: [PATCH] Revert "cherry pick e873304 from
 https://gitee.com/xiao-ming-k/third_party_skia/pulls/983"

This reverts commit c2dd2a29ef40128f8dac15b7d5b9a71000356303.
---
 BUILD.gn                                                       | 3 +++
 third_party/externals/angle2/BUILD.gn                          | 1 +
 third_party/externals/dawn/src/dawn/BUILD.gn                   | 1 +
 third_party/externals/dawn/src/dawn_native/BUILD.gn            | 1 +
 third_party/externals/dawn/src/dawn_wire/BUILD.gn              | 1 +
 third_party/externals/swiftshader/src/OpenGL/compiler/BUILD.gn | 1 +
 6 files changed, 8 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index 9ccd41b208..7284341e9a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -388,6 +388,7 @@ template("optional") {
       if (defined(invoker.configs)) {
         configs += invoker.configs
       }
+      all_dependent_configs = [ ":" + target_name + "_public" ]
       public_configs = [ ":" + target_name + "_public" ]
     }
     if (defined(invoker.sources_for_tests) && skia_enable_tools) {
@@ -421,6 +422,7 @@ template("optional") {
           deps = []
         }
         deps += [ ":test" ]
+        all_dependent_configs = [ ":" + target_name + "_public" ]
         public_configs = [ ":" + target_name + "_public" ]
       }
     }
@@ -2487,6 +2489,7 @@ if (skia_enable_tools) {
 
     # Bots and even devs may not have Vulkan headers, so put
     # include/third_party/vulkan on our path so they're always available.
+    all_dependent_configs = [ ":our_vulkan_headers" ]
     public_configs = [ ":our_vulkan_headers" ]
     defines = []
     if (skia_enable_discrete_gpu) {
diff --git a/third_party/externals/angle2/BUILD.gn b/third_party/externals/angle2/BUILD.gn
index 41c0e3ea43..66120f9ced 100644
--- a/third_party/externals/angle2/BUILD.gn
+++ b/third_party/externals/angle2/BUILD.gn
@@ -381,6 +381,7 @@ angle_static_library("angle_common") {
   ]
   public_configs += [ ":angle_common_config" ]
   if (angle_has_build && use_fuzzing_engine) {
+    all_dependent_configs = [ ":angle_disable_pool_alloc" ]
     public_configs = [ ":angle_disable_pool_alloc" ]
   }
 
diff --git a/third_party/externals/dawn/src/dawn/BUILD.gn b/third_party/externals/dawn/src/dawn/BUILD.gn
index 5544b36a15..0a2565e780 100644
--- a/third_party/externals/dawn/src/dawn/BUILD.gn
+++ b/third_party/externals/dawn/src/dawn/BUILD.gn
@@ -30,6 +30,7 @@ dawn_json_generator("dawn_headers_gen") {
 }
 
 source_set("dawn_headers") {
+  all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   public_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   public_deps = [ ":dawn_headers_gen" ]
 
diff --git a/third_party/externals/dawn/src/dawn_native/BUILD.gn b/third_party/externals/dawn/src/dawn_native/BUILD.gn
index 628bae40b4..8c165deacc 100644
--- a/third_party/externals/dawn/src/dawn_native/BUILD.gn
+++ b/third_party/externals/dawn/src/dawn_native/BUILD.gn
@@ -138,6 +138,7 @@ if (dawn_enable_opengl) {
 # dependencies of dawn_native
 source_set("dawn_native_headers") {
   public_deps = [ "${dawn_root}/src/dawn:dawncpp_headers" ]
+  all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   public_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   sources = [
     "${dawn_root}/src/include/dawn_native/DawnNative.h",
diff --git a/third_party/externals/dawn/src/dawn_wire/BUILD.gn b/third_party/externals/dawn/src/dawn_wire/BUILD.gn
index 8f45a09d01..2050fef2ba 100644
--- a/third_party/externals/dawn/src/dawn_wire/BUILD.gn
+++ b/third_party/externals/dawn/src/dawn_wire/BUILD.gn
@@ -21,6 +21,7 @@ import("${dawn_root}/scripts/dawn_component.gni")
 # dependencies of dawn_wire
 source_set("dawn_wire_headers") {
   public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ]
+  all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   public_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ]
   sources = [
     "${dawn_root}/src/include/dawn_wire/Wire.h",
diff --git a/third_party/externals/swiftshader/src/OpenGL/compiler/BUILD.gn b/third_party/externals/swiftshader/src/OpenGL/compiler/BUILD.gn
index 7f66ef8482..019ed62c24 100644
--- a/third_party/externals/swiftshader/src/OpenGL/compiler/BUILD.gn
+++ b/third_party/externals/swiftshader/src/OpenGL/compiler/BUILD.gn
@@ -74,6 +74,7 @@ swiftshader_source_set("swiftshader_opengl_compiler") {
   ]
 
   if (use_fuzzing_engine) {
+    all_dependent_configs = [ ":swiftshader_translator_disable_pool_alloc" ]
     public_configs = [ ":swiftshader_translator_disable_pool_alloc" ]
   }
 
-- 
Gitee