commit ca85b95952ef2815b859a180a138c66b3284318b
author Dominik Röttsches <drott@chromium.org> Fri May 26 14:43:28 2023 +0300
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri May 26 17:52:10 2023 +0000
tree 37d9a998e7fea8e0ef26d685604f7ad880947161
parent c1e452c677ea5e1fb2fcf94efc83eb01283f7857

[Fontations] Remove middle gen/ path extension for cxxbridge output

Inserting gen/ is not compatible with how Blink buildfiles generate
cxxbridge output and leads to requiring #include statements with
different paths in the Skia and in the Blink context.

Blink's GN rules for cxxbridge output the generated
files (as other Blink generated files) to a top-level gen/ directory in
the GN output directory, then add these paths as include path.

The path pointing to the source file in the #include directive in the
C++ file should a) be the same in Skia and Blink contexts and b) should
look identical to the path to the Rust source from which cxxbridge
generated this file. To that effect, remove the "gen/" path extension in
the run_cxxbridge_cmd rule.

Fixed: skia:14332
Change-Id: Ia3246f6a6a7073aa9f5d731003cf354b345e2459
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/703856
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Dominik Röttsches <drott@google.com>

bazel/rust_cxx_bridge.bzl

diff --git a/bazel/rust_cxx_bridge.bzl b/bazel/rust_cxx_bridge.bzl
index 8c37c1d..4f45f72 100644
--- a/bazel/rust_cxx_bridge.bzl
+++ b/bazel/rust_cxx_bridge.bzl
@@ -24,8 +24,8 @@
       visibility: Visibility of the generated sub-rules.
       crate_features: Feature flags to enable for codegen. See https://doc.rust-lang.org/cargo/reference/features.html.
     """
-    out_h = "gen/%s.h" % src
-    out_cc = "gen/%s.cc" % src
+    out_h = "%s.h" % src
+    out_cc = "%s.cc" % src
 
     run_cxxbridge_cmd(
         name = "%s/generated" % name,

src/ports/SkTypeface_fontations.h

diff --git a/src/ports/SkTypeface_fontations.h b/src/ports/SkTypeface_fontations.h
index bd9b0f4..11b4e37 100644
--- a/src/ports/SkTypeface_fontations.h
+++ b/src/ports/SkTypeface_fontations.h
@@ -12,7 +12,7 @@
 #include "include/core/SkTypeface.h"
 #include "src/core/SkAdvancedTypefaceMetrics.h"
 #include "src/core/SkScalerContext.h"
-#include "src/ports/fontations/gen/src/ffi.rs.h"
+#include "src/ports/fontations/src/ffi.rs.h"
 
 #include <memory>
 

third_party/vello/cpp/vello.h

diff --git a/third_party/vello/cpp/vello.h b/third_party/vello/cpp/vello.h
index 6c3b658..b91bc64 100644
--- a/third_party/vello/cpp/vello.h
+++ b/third_party/vello/cpp/vello.h
@@ -6,6 +6,6 @@
 #ifndef THIRD_PARTY_VELLO_CPP_VELLO_H_
 #define THIRD_PARTY_VELLO_CPP_VELLO_H_
 
-#include "third_party/vello/gen/src/lib.rs.h"
+#include "third_party/vello/src/lib.rs.h"
 
 #endif  // THIRD_PARTY_VELLO_CPP_VELLO_H_