commit adb19b9b603ba83ba49b1a10b6301e396132bf3b
author Brian Carlstrom <bdc@google.com> Wed Jun 18 12:45:45 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jun 18 19:06:35 2014 -0700
tree b41c1452d62f1c848212dd7ea50004ae68934238
parent 1265f1c73c6ae3b03a973f048cdc8754ee87e026

Dalvik is dead, long live Dalvik! DO NOT MERGE

croot
cd libcore
repo start dalvik-is-dead-long-live-dalvik .
repo sync -c .
git rm -r libdvm
git add JavaLibrary.mk (after removing libdvm references, adding explict core-libart references)
git add Docs.mk (after replacing references to libdvm with libart)
git add benchmarks/Android.mk (after adding explict core-libart references)
git add Android.mk (after removing dalvik-host target)
git commit -a -m 'Dalvik is dead, long live Dalvik! DO NOT MERGE'

Bug: 14298175
Change-Id: I0e7a3ce47e0b6e3a7b15006a6d17d103d23e8064

Docs.mk

diff --git a/Docs.mk b/Docs.mk
index 612b3d9..a163d1f 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -17,8 +17,8 @@
    dalvik/src/main/java/dalvik/annotation \
    dalvik/src/main/java/dalvik/bytecode \
    json/src/main/java \
-   libdvm/src/main/java/dalvik \
-   libdvm/src/main/java/java \
+   libart/src/main/java/dalvik \
+   libart/src/main/java/java \
    luni/src/main/java/android \
    luni/src/main/java/java \
    luni/src/main/java/javax \