build: clean up java dep structure (#190)

Signed-off-by: Mike Schore <[email protected]> Signed-off-by: JP Simard <[email protected]>
envoyproxy · Nov 28, 2022 · 58f08a4 · 58f08a4
1 parent f701cd5
commit 58f08a4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/mobile/library/BUILD b/mobile/library/BUILD
@@ -22,20 +22,11 @@ aar_with_jni(
 kt_android_library(
     name = "android_lib",
     srcs = [
-        "java/io/envoyproxy/envoymobile/engine/EnvoyEngine.java",
         "kotlin/io/envoyproxy/envoymobile/Envoy.kt",
+        "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_srcs",
     ],
     custom_package = "io.envoyproxy.envoymobile",
     manifest = "kotlin/io/envoyproxy/envoymobile/EnvoyManifest.xml",
     visibility = ["//visibility:public"],
-    deps = ["envoy_engine_lib"],
-)
-
-android_library(
-    name = "envoy_engine_lib",
-    srcs = ["java/io/envoyproxy/envoymobile/engine/EnvoyEngine.java"],
-    custom_package = "io.envoyproxy.envoymobile.engine",
-    manifest = "java/io/envoyproxy/envoymobile/engine/EnvoyEngineManifest.xml",
-    visibility = ["//visibility:public"],
-    deps = ["//library/common:envoy_jni_interface_lib"],
+    deps = ["//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib"],
 )
diff --git a/mobile/library/java/io/envoyproxy/envoymobile/engine/BUILD b/mobile/library/java/io/envoyproxy/envoymobile/engine/BUILD
@@ -0,0 +1,18 @@
+licenses(["notice"])  # Apache 2
+
+# These source files must be re-exported to the kotlin custom library rule to ensure their
+# inclusion.
+filegroup(
+    name = "envoy_engine_srcs",
+    srcs = ["EnvoyEngine.java"],
+    visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "envoy_engine_lib",
+    srcs = [":envoy_engine_srcs"],
+    custom_package = "io.envoyproxy.envoymobile.engine",
+    manifest = "EnvoyEngineManifest.xml",
+    visibility = ["//visibility:public"],
+    deps = ["//library/common:envoy_jni_interface_lib"],
+)