diff options
| author | 2017-07-26 12:57:41 -0700 | |
|---|---|---|
| committer | 2017-07-26 12:57:41 -0700 | |
| commit | 5d15e6cacd82a3983295e6c3fc03626006baaf70 (patch) | |
| tree | 55070efc62a05017a279214533fc04635aebc90d | |
| parent | 92b601462ffced04bd66e6ce47097664c746a34c (diff) | |
ART: Move openjdkjvm to art/
Move libopenjdkjvm out of the runtime directory. Let's not
pollute the runtime library.
Test: m test-art-host
Change-Id: I3864c97c749fd791ab1b43173c2580872cf0d57d
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | openjdkjvm/Android.bp (renamed from runtime/openjdkjvm/Android.bp) | 1 | ||||
| -rw-r--r-- | openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION (renamed from runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION) | 0 | ||||
| -rw-r--r-- | openjdkjvm/NOTICE (renamed from runtime/openjdkjvm/NOTICE) | 0 | ||||
| -rw-r--r-- | openjdkjvm/OpenjdkJvm.cc (renamed from runtime/openjdkjvm/OpenjdkJvm.cc) | 0 | ||||
| -rw-r--r-- | runtime/Android.bp | 1 |
6 files changed, 1 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index d0e22fb873..dff6efa95b 100644 --- a/Android.bp +++ b/Android.bp @@ -31,6 +31,7 @@ subdirs = [ "disassembler", "imgdiag", "oatdump", + "openjdkjvm", "patchoat", "profman", "runtime", diff --git a/runtime/openjdkjvm/Android.bp b/openjdkjvm/Android.bp index 37112b61e7..071b4348f8 100644 --- a/runtime/openjdkjvm/Android.bp +++ b/openjdkjvm/Android.bp @@ -18,7 +18,6 @@ cc_defaults { defaults: ["art_defaults"], host_supported: true, srcs: ["OpenjdkJvm.cc"], - include_dirs: ["art/runtime"], shared_libs: [ "libbase", "libnativehelper" diff --git a/runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION b/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION index e69de29bb2..e69de29bb2 100644 --- a/runtime/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION +++ b/openjdkjvm/MODULE_LICENSE_GPL_WITH_CLASSPATH_EXCEPTION diff --git a/runtime/openjdkjvm/NOTICE b/openjdkjvm/NOTICE index 700a206a6c..700a206a6c 100644 --- a/runtime/openjdkjvm/NOTICE +++ b/openjdkjvm/NOTICE diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc index b212ea1c20..b212ea1c20 100644 --- a/runtime/openjdkjvm/OpenjdkJvm.cc +++ b/openjdkjvm/OpenjdkJvm.cc diff --git a/runtime/Android.bp b/runtime/Android.bp index 8d15c349dd..1df647d2b1 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -627,7 +627,6 @@ art_cc_test { } subdirs = [ - "openjdkjvm", "openjdkjvmti", "simulator", ] |