Rename data_dir to angle_data_dir in GN files

gni/angle.gni

@@ -21,7 +21,7 @@ if (build_with_chromium) {
 }
 
 # Subdirectory to place data files (e.g. layer JSON files).
-data_dir = "angledata"
+angle_data_dir = "angledata"
 
 declare_args() {
   if (current_cpu == "arm64" || current_cpu == "x64" ||

src/tests/BUILD.gn

@@ -1007,7 +1007,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     ]
 
     outputs = [
-      "$root_out_dir/$data_dir/gl_cts/data/gles3/{{source_file_part}}",
+      "$root_out_dir/$angle_data_dir/gl_cts/data/gles3/{{source_file_part}}",
     ]
   }
 
@@ -1019,12 +1019,12 @@ if (build_angle_deqp_tests && !is_fuchsia) {
         ":angle_deqp_khr_data",
       ]
 
-      defines += [ "ANGLE_DEQP_DATA_DIR=\"$data_dir\"" ]
+      defines += [ "ANGLE_DEQP_DATA_DIR=\"$angle_data_dir\"" ]
 
       mustpass_dir = _khronos_mustpass
 
       data = [
-        "$root_out_dir/$data_dir/gl_cts/",
+        "$root_out_dir/$angle_data_dir/gl_cts/",
       ]
     }
   }

third_party/vulkan-loader/BUILD.gn

@@ -7,6 +7,7 @@
 # https://github.com/KhronosGroup/Vulkan-Loader
 
 import("../../gni/angle.gni")
+
 import("$angle_root/third_party/vulkan-headers/vulkan_headers_script_deps.gni")
 
 # Fuchsia has non-upstream changes to the vulkan loader, so we don't want
@@ -166,8 +167,8 @@ config("vulkan_loader_config") {
     "src/loader",
   ]
   defines = [
-    "ANGLE_VK_DATA_DIR=\"$data_dir\"",
-    "ANGLE_VK_ICD_JSON=\"$data_dir/VkICD_mock_icd.json\"",
+    "ANGLE_VK_DATA_DIR=\"$angle_data_dir\"",
+    "ANGLE_VK_ICD_JSON=\"$angle_data_dir/VkICD_mock_icd.json\"",
     "API_NAME=\"Vulkan\"",
   ]
 

third_party/vulkan-tools/BUILD.gn

@@ -183,10 +183,10 @@ if (!is_android) {
 
     # The layer JSON files are part of the necessary data deps.
     outputs = [
-      "$root_out_dir/$data_dir/VkICD_mock_icd.json",
+      "$root_out_dir/$angle_data_dir/VkICD_mock_icd.json",
     ]
     data = outputs
-    args += [ rebase_path("$root_out_dir/$data_dir", root_build_dir) ] +
+    args += [ rebase_path("$root_out_dir/$angle_data_dir", root_build_dir) ] +
             rebase_path(sources, root_build_dir)
   }
 }

third_party/vulkan-validation-layers/BUILD.gn

@@ -23,7 +23,7 @@ if (is_win) {
 }
 
 raw_root_out_dir = rebase_path(root_out_dir, root_build_dir)
-raw_data_dir = rebase_path("$root_out_dir/$data_dir", root_build_dir)
+raw_data_dir = rebase_path("$root_out_dir/$angle_data_dir", root_build_dir)
 
 raw_vulkan_headers_dir =
     rebase_path("$angle_root/third_party/vulkan-headers/src", root_build_dir)
@@ -419,11 +419,11 @@ if (!is_android) {
     outputs = []
     foreach(json_name, json_names) {
       sources += [ "src/layers/json/$json_name.in" ]
-      outputs += [ "$root_out_dir/$data_dir/$json_name" ]
+      outputs += [ "$root_out_dir/$angle_data_dir/$json_name" ]
     }
     args = [
              "$raw_vulkan_layers_dir/layers/json",
-             rebase_path("$root_out_dir/$data_dir", root_build_dir),
+             rebase_path("$root_out_dir/$angle_data_dir", root_build_dir),
            ] + rebase_path(sources, root_build_dir)
 
     # The layer JSON files are part of the necessary data deps.