From d7b3c7f0044bc5d120cd6d516866ab399489b4e7 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Wed, 18 Nov 2015 09:49:10 +0000
Subject: [PATCH] Rename native library.

Change-Id: I3b89059a91ebb70ee5007a03d5dd237f6bff1251
---
 Android.mk               | 8 ++++----
 build/Android.gtest.mk   | 4 ++--
 runtime/runtime.cc       | 6 +++---
 test/Android.run-test.mk | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3a0a435cf..3d8cb46ec 100644
--- a/Android.mk
+++ b/Android.mk
@@ -95,20 +95,20 @@ ART_HOST_DEPENDENCIES := \
 	$(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \
 	$(HOST_OUT_JAVA_LIBRARIES)/core-oj-hostdex.jar \
 	$(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
-	$(ART_HOST_OUT_SHARED_LIBRARIES)/libxxavacore$(ART_HOST_SHLIB_EXTENSION)
+	$(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION)
 ART_TARGET_DEPENDENCIES := \
 	$(ART_TARGET_EXECUTABLES) \
 	$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \
 	$(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar \
 	$(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \
-	$(TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so
+	$(TARGET_OUT_SHARED_LIBRARIES)/libopenjdk.so
 ifdef TARGET_2ND_ARCH
 ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
-ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so
+ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libopenjdk.so
 endif
 ifdef HOST_2ND_ARCH
 ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libjavacore.so
-ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libxxavacore.so
+ART_HOST_DEPENDENCIES += $(2ND_HOST_OUT_SHARED_LIBRARIES)/libopenjdk.so
 endif
 
 ########################################################################
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 69f7e3439..067b0ad5b 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -333,7 +333,7 @@ define define-art-gtest-rule-target
     $(foreach file,$(ART_GTEST_$(1)_DEX_DEPS),$(ART_TEST_TARGET_GTEST_$(file)_DEX)) \
     $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \
     $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \
-    $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so \
+    $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libopenjdk.so \
     $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \
     $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar
 
@@ -377,7 +377,7 @@ define define-art-gtest-rule-host
   # Dependencies for all host gtests.
   gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
     $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
-    $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libxxavacore$$(ART_HOST_SHLIB_EXTENSION)
+    $$($(2)ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$$(ART_HOST_SHLIB_EXTENSION)
 
 
 .PHONY: $$(gtest_rule)
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 61f75f4f8..e3a0d07f1 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1140,7 +1140,7 @@ void Runtime::InitNativeMethods() {
   // Then set up the native methods provided by the runtime itself.
   RegisterRuntimeNativeMethods(env);
 
-  // Then set up libjavacore / libxxavacore, which are just a regular JNI libraries with
+  // Then set up libjavacore / libopenjdk, which are just a regular JNI libraries with
   // a regular JNI_OnLoad. Most JNI libraries can just use System.loadLibrary, but
   // libcore can't because it's the library that implements System.loadLibrary!
   {
@@ -1151,8 +1151,8 @@ void Runtime::InitNativeMethods() {
   }
   {
     std::string reason;
-    if (!java_vm_->LoadNativeLibrary(env, "libxxavacore.so", nullptr, &reason)) {
-      LOG(FATAL) << "LoadNativeLibrary failed for \"libxxavacore.so\": " << reason;
+    if (!java_vm_->LoadNativeLibrary(env, "libopenjdk.so", nullptr, &reason)) {
+      LOG(FATAL) << "LoadNativeLibrary failed for \"libopenjdk.so\": " << reason;
     }
   }
 
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 403f91076..10008f416 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -584,14 +584,14 @@ ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libnativebridgetest$(ART_HOST_SHLIB_EXTENSION) \
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
-  $(ART_HOST_OUT_SHARED_LIBRARIES)/libxxavacore$(ART_HOST_SHLIB_EXTENSION)
+  $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION)
 
 ifneq ($(HOST_PREFER_32_BIT),true)
 ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \
   $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) \
   $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libnativebridgetest$(ART_HOST_SHLIB_EXTENSION) \
   $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION) \
-  $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libxxavacore$(ART_HOST_SHLIB_EXTENSION)
+  $(2ND_ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdk$(ART_HOST_SHLIB_EXTENSION)
 endif
 
 # Create a rule to build and run a tests following the form:
-- 
2.11.0