--- a/make/common/JdkNativeCompilation.gmk Tue Oct 29 14:22:18 2019 -0400
+++ b/make/common/JdkNativeCompilation.gmk Tue Oct 29 12:01:14 2019 -0700
@@ -47,7 +47,8 @@
$(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
$(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
-# Find a library
+# Find a library. Used for declaring dependencies on libraries in different
+# modules.
# Param 1 - module name
# Param 2 - library name
# Param 3 - optional subdir for library
@@ -69,6 +70,12 @@
FindLib =
FindStaticLib =
endif
+# If building static versions of libraries, make these return empty to avoid
+# declaring dependencies.
+ifeq ($(STATIC_LIBS), true)
+ FindLib =
+ FindStaticLib =
+endif
GetJavaHeaderDir = \
$(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))