commit 2f0a771d01ee3f8cedcfb4817d43856ff31bb03a
author Colin Cross <ccross@android.com> Fri Jan 05 21:57:59 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 05 21:57:59 2018 +0000
tree e78d46f9b7bf87cd0a65b7c0c59ae313d7c473ca
parent c0b06e55d3d29a1a0c8817b5d9c9e8debb9763c7
parent e1e4cd5561a44f89a303ead866828d7c32ce993f

Merge "ANDROID BACKPORT 8189131: Open-source the Oracle JDK Root Certificates"

make/lib/SecurityLibraries.gmk

diff --git a/make/lib/SecurityLibraries.gmk b/make/lib/SecurityLibraries.gmk
index be73c52..3ba8bbc 100644
--- a/make/lib/SecurityLibraries.gmk
+++ b/make/lib/SecurityLibraries.gmk
@@ -28,6 +28,8 @@
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   # JavaNativeFoundation framework not supported in static builds 
   ifneq ($(STATIC_BUILD), true)
+  # ANDROID: disable libosxsecurity library, it requires an Apple runtime library to build
+  ifdef NEVER_BUILD
 
   ################################################################################
 
@@ -63,4 +65,5 @@
   ################################################################################
 
   endif
+  endif
 endif

src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h

diff --git a/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h b/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
index 231b5f6..56f9688 100644
--- a/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
+++ b/src/java.desktop/share/native/libfontmanager/layout/LEInsertionList.h
@@ -101,7 +101,7 @@
     /**
      * The destructor.
      */
-    ~LEInsertionList();
+    virtual ~LEInsertionList();
 
     /**
      * Add an entry to the insertion list.