From 3cb591954e63992226da950a22f516a1d11daa24 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Wed, 28 Mar 2018 16:18:21 -0700 Subject: [PATCH] Allow rocksdbjavastatic to also be built as debug build Summary: Closes https://github.com/facebook/rocksdb/pull/3654 Differential Revision: D7417948 Pulled By: sagar0 fbshipit-source-id: 9514df9328181e54a6384764444c0c7ce66e7f5f --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9a6143eb4c..e892952a6f 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,9 @@ ifeq ($(MAKECMDGOALS),install) endif ifeq ($(MAKECMDGOALS),rocksdbjavastatic) - DEBUG_LEVEL=0 + ifneq ($(DEBUG_LEVEL),2) + DEBUG_LEVEL=0 + endif endif ifeq ($(MAKECMDGOALS),rocksdbjavastaticrelease) @@ -1719,7 +1721,9 @@ rocksdbjavastatic: $(java_static_all_libobjects) -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \ $(java_static_all_libobjects) $(COVERAGEFLAGS) \ $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS) - cd java/target;strip $(STRIPFLAGS) $(ROCKSDBJNILIB) + cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \ + strip $(STRIPFLAGS) $(ROCKSDBJNILIB); \ + fi cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB) cd java/target/classes;jar -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class