# HG changeset patch
# User erikj
# Date 1482161196 -3600
# Node ID af2357d4511c10d18fa8c797e23fb8bc7114c096
# Parent  7adb02a61b45be89c2335ba3ea4892026fe7d3b8
8171310: Gtest libjvm.so is always stripped
Reviewed-by: tbell, dholmes, stuefe

diff -r 7adb02a61b45 -r af2357d4511c make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Tue Dec 13 02:04:18 2016 +0100
+++ b/make/common/NativeCompilation.gmk	Mon Dec 19 16:26:36 2016 +0100
@@ -371,7 +371,8 @@
 #       when compiling C code
 #   DISABLED_WARNINGS_CXX_<toolchain> Disable the given warnings for the specified
 #       toolchain when compiling C++ code
-#   STRIP_SYMBOLS Set to true to strip the final binary if the toolchain allows for it
+#   STRIP_SYMBOLS Set to false to override global strip policy and always leave
+#       symbols in the binary, if the toolchain allows for it
 #   DEBUG_SYMBOLS Set to false to disable generation of debug symbols
 #   COPY_DEBUG_SYMBOLS Set to false to override global setting of debug symbol copying
 #   ZIP_EXTERNAL_DEBUG_SYMBOLS Set to false to override global setting of debug symbol
@@ -886,6 +887,10 @@
     endif # $1_DEBUG_SYMBOLS != false
   endif # COPY_DEBUG_SYMBOLS
 
+  # Unless specifically set, stripping should only happen if symbols are also
+  # being copied.
+  $$(call SetIfEmpty, $1_STRIP_SYMBOLS, $$($1_COPY_DEBUG_SYMBOLS))
+
   ifneq ($$($1_STRIP_SYMBOLS), false)
     ifneq ($$($1_STRIP), )
       # Default to using the global STRIPFLAGS. Allow for overriding with an empty value