From fea58f201821c8acaa37c7cabdb150950f8a056f Mon Sep 17 00:00:00 2001
From: Karl Lessard <karl.lessard@gmail.com>
Date: Sat, 3 Feb 2024 22:42:42 -0500
Subject: [PATCH] Restore Javacpp config layout

---
 .../internal/c_api/presets/tensorflow.java    | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java b/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java
index 3dabd2a4037..b7d42fa37c3 100644
--- a/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java
+++ b/tensorflow-core/tensorflow-core-native/src/main/java/org/tensorflow/internal/c_api/presets/tensorflow.java
@@ -43,11 +43,6 @@
       @Platform(
           value = {"linux", "macosx", "windows"},
           compiler = "cpp17",
-          extension = {"-gpu"},
-          resource = {"LICENSE", "THIRD_PARTY_TF_JNI_LICENSES"}
-      ),
-      @Platform(
-          value = {"linux", "macosx"},
           include = {
             "tensorflow/tsl/platform/ctstring_internal.h",
             "tensorflow/tsl/platform/ctstring.h",
@@ -70,25 +65,18 @@
             "tfj_scope.h",
             "tfj_gradients.h",
           },
-          link = {"tensorflow_cc@.2", "tensorflow_framework@.2"}
+          link = {"tensorflow_cc@.2", "tensorflow_framework@.2"},
+          resource = {"LICENSE", "THIRD_PARTY_TF_JNI_LICENSES"},
+          extension = {"-gpu"}
       ),
       @Platform(
           value = "windows",
-          include = {
-            "tensorflow/tsl/platform/ctstring_internal.h",
-            "tensorflow/tsl/platform/ctstring.h",
-            "tensorflow/tsl/c/tsl_status.h",
-            "tensorflow/c/c_api_macros.h",
-            "tensorflow/c/tf_datatype.h",
-            "tensorflow/c/tf_status.h",
-            "tensorflow/c/tf_buffer.h",
-            "tensorflow/c/tf_tensor.h",
-            "tensorflow/c/tf_attrtype.h",
-            "tensorflow/c/c_api.h",
-            "tensorflow/c/tf_tstring.h",
-            "tensorflow/c/eager/c_api.h",
-            "tensorflow/c/eager/c_api_experimental.h",
+          exclude = {
+            "tfj_graph.h",
+            "tfj_scope.h",
+            "tfj_gradients.h",
           },
+          link = {"tensorflow"},
           preload = {
             "api-ms-win-crt-locale-l1-1-0",
             "api-ms-win-crt-string-l1-1-0",
@@ -136,8 +124,7 @@
             "msvcr120",
             "libiomp5md",
             "mklml"
-          },
-          link = {"tensorflow"}
+          }
       ),
       @Platform(
           value = "windows-x86_64",