commit 897ebc7a71ec9f446b1152ad08eda4ff652c061f
author Corentin Wallez <cwallez@chromium.org> Wed Sep 18 04:33:12 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed Sep 18 04:33:12 2019 +0000
tree 0dcfef683f6cddda8cfaaaae928e6c56bbb920a7
parent b495e484055d37106a1d137b371acc3b9a44e6bd

Normalize generated file paths to match main tree.

Previously dawn_native files were in src/dawn_native/ while generated
files were in dawn_native/. This makes some things complicated when
integrating in other source trees so normalize all generated files to be
in paths that match the main tree.

BUG=dawn:225

Change-Id: I5b3e04d37a16251143578dfb7a31445b229fe4ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11300
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index fe46537..8394623 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -55,11 +55,11 @@
 dawn_json_generator("libdawn_native_utils_gen") {
   target = "dawn_native_utils"
   outputs = [
-    "dawn_native/ProcTable.cpp",
-    "dawn_native/dawn_structs_autogen.h",
-    "dawn_native/dawn_structs_autogen.cpp",
-    "dawn_native/ValidationUtils_autogen.h",
-    "dawn_native/ValidationUtils_autogen.cpp",
+    "src/dawn_native/ProcTable.cpp",
+    "src/dawn_native/dawn_structs_autogen.h",
+    "src/dawn_native/dawn_structs_autogen.cpp",
+    "src/dawn_native/ValidationUtils_autogen.h",
+    "src/dawn_native/ValidationUtils_autogen.cpp",
   ]
 }
 
@@ -74,9 +74,9 @@
                   root_build_dir),
     ]
     outputs = [
-      "dawn_native/opengl/OpenGLFunctionsBase_autogen.cpp",
-      "dawn_native/opengl/OpenGLFunctionsBase_autogen.h",
-      "dawn_native/opengl/opengl_platform_autogen.h",
+      "src/dawn_native/opengl/OpenGLFunctionsBase_autogen.cpp",
+      "src/dawn_native/opengl/OpenGLFunctionsBase_autogen.h",
+      "src/dawn_native/opengl/opengl_platform_autogen.h",
     ]
   }
 }
@@ -400,9 +400,9 @@
       "src/dawn_native/vulkan/BufferVk.h",
       "src/dawn_native/vulkan/CommandBufferVk.cpp",
       "src/dawn_native/vulkan/CommandBufferVk.h",
+      "src/dawn_native/vulkan/CommandRecordingContext.h",
       "src/dawn_native/vulkan/ComputePipelineVk.cpp",
       "src/dawn_native/vulkan/ComputePipelineVk.h",
-      "src/dawn_native/vulkan/CommandRecordingContext.h",
       "src/dawn_native/vulkan/DeviceVk.cpp",
       "src/dawn_native/vulkan/DeviceVk.h",
       "src/dawn_native/vulkan/ExternalHandle.h",
@@ -520,18 +520,18 @@
 dawn_json_generator("libdawn_wire_gen") {
   target = "dawn_wire"
   outputs = [
-    "dawn_wire/WireCmd_autogen.h",
-    "dawn_wire/WireCmd_autogen.cpp",
-    "dawn_wire/client/ApiObjects_autogen.h",
-    "dawn_wire/client/ApiProcs_autogen.cpp",
-    "dawn_wire/client/ApiProcs_autogen.h",
-    "dawn_wire/client/ClientBase_autogen.h",
-    "dawn_wire/client/ClientHandlers_autogen.cpp",
-    "dawn_wire/client/ClientPrototypes_autogen.inc",
-    "dawn_wire/server/ServerBase_autogen.h",
-    "dawn_wire/server/ServerDoers_autogen.cpp",
-    "dawn_wire/server/ServerHandlers_autogen.cpp",
-    "dawn_wire/server/ServerPrototypes_autogen.inc",
+    "src/dawn_wire/WireCmd_autogen.h",
+    "src/dawn_wire/WireCmd_autogen.cpp",
+    "src/dawn_wire/client/ApiObjects_autogen.h",
+    "src/dawn_wire/client/ApiProcs_autogen.cpp",
+    "src/dawn_wire/client/ApiProcs_autogen.h",
+    "src/dawn_wire/client/ClientBase_autogen.h",
+    "src/dawn_wire/client/ClientHandlers_autogen.cpp",
+    "src/dawn_wire/client/ClientPrototypes_autogen.inc",
+    "src/dawn_wire/server/ServerBase_autogen.h",
+    "src/dawn_wire/server/ServerDoers_autogen.cpp",
+    "src/dawn_wire/server/ServerHandlers_autogen.cpp",
+    "src/dawn_wire/server/ServerPrototypes_autogen.inc",
   ]
 }
 
@@ -723,8 +723,8 @@
 dawn_json_generator("mock_dawn_gen") {
   target = "mock_dawn"
   outputs = [
-    "mock/mock_dawn.h",
-    "mock/mock_dawn.cpp",
+    "src/dawn/mock_dawn.h",
+    "src/dawn/mock_dawn.cpp",
   ]
 }