symbols: conditionally create symbols map (#2053)

Signed-off-by: Martin Conte Mac Donell <[email protected]> Signed-off-by: JP Simard <[email protected]>
envoyproxy · Nov 28, 2022 · 604d575 · 604d575
1 parent ca8904a
commit 604d575
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/mobile/BUILD b/mobile/BUILD
@@ -59,11 +59,16 @@ genrule(
     set -- $(SRCS)
     chmod 755 $$1
     chmod 755 $$2
-    chmod 755 dist/*.objdump
     cp $$1 dist/envoy.aar
     cp $$2 dist/envoy-pom.xml
     shift 2
-    cp $$@ dist/
+
+    mkdir -p dist/symbols
+    if [[ -n "$$@" ]]; then
+        chmod 755 $$@
+        cp $$@ dist/symbols
+        tar -cvf dist/symbols.tar dist/symbols
+    fi
     touch $@
     """,
     stamp = True,

diff --git a/mobile/library/kotlin/io/envoyproxy/envoymobile/BUILD b/mobile/library/kotlin/io/envoyproxy/envoymobile/BUILD
@@ -10,9 +10,10 @@ android_artifacts(
     android_library = ":envoy_lib",
     archive_name = "envoy",
     manifest = "EnvoyManifest.xml",
-    native_deps = [
-        "//library/common/jni:libenvoy_jni.so.debug_info",
-    ],
+    native_deps = select({
+        "@envoy//bazel:opt_build": ["//library/common/jni:libenvoy_jni.so.debug_info"],
+        "//conditions:default": ["//library/common/jni:libenvoy_jni.so"],
+    }),
     proguard_rules = "//library:proguard_rules",
     visibility = ["//visibility:public"],
 )