From fd8081a1399d081e329ad05bb7dce391906ea376 Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Fri, 9 Jan 2026 14:19:15 -0800
Subject: [PATCH] Fix protoc file generation command.

PiperOrigin-RevId: 854341687
---
 .github/actions/swift-protobuf/action.yml | 5 +++--
 Package.swift                             | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/actions/swift-protobuf/action.yml b/.github/actions/swift-protobuf/action.yml
index 95641f4b..27b269fc 100644
--- a/.github/actions/swift-protobuf/action.yml
+++ b/.github/actions/swift-protobuf/action.yml
@@ -36,8 +36,9 @@ runs:
     shell: bash
   - name: generate ukey2 proto bindings
     run: |
-      cd third_party/ukey2
+      cd third_party/ukey2/ukey2
       mkdir protoc_out
-      protoc --cpp_out=protoc_out --proto_path=ukey2 --proto_path=ukey2/src/main/proto ukey2/src/main/proto/device_to_device_messages.proto ukey2/src/main/proto/securegcm.proto ukey2/src/main/proto/securemessage.proto ukey2/src/main/proto/ukey.proto
+      protoc --cpp_out=protoc_out --proto_path=. --proto_path=src/main/proto src/main/proto/device_to_device_messages.proto
+      protoc --cpp_out=protoc_out src/main/proto/securegcm.proto src/main/proto/securemessage.proto src/main/proto/ukey.proto
       ls -lR protoc_out
     shell: bash
diff --git a/Package.swift b/Package.swift
index 4dcd9147..8c9ff96d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -88,13 +88,13 @@ let package = Package(
       sources: [
         "ukey2/src/securemessage/src/securemessage",
         "ukey2/src/main/cpp/src/securegcm",
-        "protoc_out",
+        "ukey2/protoc_out",
       ],
       publicHeadersPath: "include",
       cSettings: [
         .headerSearchPath("ukey2/"),
-        .headerSearchPath("protoc_out/"),
-        .headerSearchPath("protoc_out/src/main/"),
+        .headerSearchPath("ukey2/protoc_out/"),
+        .headerSearchPath("ukey2/protoc_out/src/main/"),
       ]
     ),
     .target(
@@ -560,7 +560,7 @@ let package = Package(
         .headerSearchPath("./"),
         .headerSearchPath("protoc_out/"),
         .headerSearchPath("third_party/ukey2/ukey2/"),
-        .headerSearchPath("third_party/ukey2/protoc_out/"),
+        .headerSearchPath("third_party/ukey2/ukey2/protoc_out/"),
         .define("NO_WEBRTC"),
       ]
     ),