commit ae616fa0e828cd6cbbae53edf3cf14338ad49dd9
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 27 15:48:11 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 27 15:48:11 2017 +0000
tree eb6effbc6bf015c98425f6cf5d99149339b40e8f
parent 54c1afa173509608085ab63931b82f72ae4b52e1
parent 5d15e6cacd82a3983295e6c3fc03626006baaf70

Merge "ART: Move openjdkjvm to art/"

Android.bp

diff --git a/Android.bp b/Android.bp
index 0ce86d8..cb72082 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,6 +31,7 @@
     "disassembler",
     "imgdiag",
     "oatdump",
+    "openjdkjvm",
     "patchoat",
     "profman",
     "runtime",

openjdkjvm/Android.bp

diff --git a/runtime/openjdkjvm/Android.bp b/openjdkjvm/Android.bp
similarity index 96%
rename from runtime/openjdkjvm/Android.bp
rename to openjdkjvm/Android.bp
index 37112b6..071b434 100644
--- a/runtime/openjdkjvm/Android.bp
+++ b/openjdkjvm/Android.bp
@@ -18,7 +18,6 @@
     defaults: ["art_defaults"],
     host_supported: true,
     srcs: ["OpenjdkJvm.cc"],
-    include_dirs: ["art/runtime"],
     shared_libs: [
         "libbase",
         "libnativehelper"

openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION

diff --git a/runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION b/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION
similarity index 100%
rename from runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION
rename to openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION

openjdkjvm/NOTICE

diff --git a/runtime/openjdkjvm/NOTICE b/openjdkjvm/NOTICE
similarity index 100%
rename from runtime/openjdkjvm/NOTICE
rename to openjdkjvm/NOTICE

openjdkjvm/OpenjdkJvm.cc

diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc
similarity index 100%
rename from runtime/openjdkjvm/OpenjdkJvm.cc
rename to openjdkjvm/OpenjdkJvm.cc

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index 18a4c8c..ff803eb 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -626,6 +626,5 @@
 }
 
 subdirs = [
-    "openjdkjvm",
     "openjdkjvmti",
 ]