[vogar] r298 committed - Update vogar to use core-libart instead of core on...

[vo...@googlecode.com]

Revision: 298
Author: nfu...@google.com
Date: Fri Jun 27 09:49:45 2014 UTC
Log: Update vogar to use core-libart instead of core on
device and host

The core library was deleted from AOSP recently, and the
host build defaulted to using ART some time ago.
http://code.google.com/p/vogar/source/detail?r=298

Modified:
/trunk/src/vogar/Run.java
/trunk/src/vogar/android/AndroidSdk.java

=======================================
--- /trunk/src/vogar/Run.java Fri Apr 19 00:30:59 2013 UTC
+++ /trunk/src/vogar/Run.java Fri Jun 27 09:49:45 2014 UTC
@@ -259,8 +259,8 @@
* appropriate for use in naming derived files.
*
* @param file a product of the android build system, such as
- * "out/core_intermediates/javalib.jar".
- * @return a recognizable base name like "core_intermediates".
+ * "out/core-libart_intermediates/javalib.jar".
+ * @return a recognizable base name like "core-libart_intermediates".
*/
public String basenameOfJar(File file) {
String name = file.getName().replaceAll("\\.jar$", "");
=======================================
--- /trunk/src/vogar/android/AndroidSdk.java Sat Mar 1 15:31:54 2014 UTC
+++ /trunk/src/vogar/android/AndroidSdk.java Fri Jun 27 09:49:45 2014 UTC
@@ -39,7 +39,7 @@
public class AndroidSdk {

// $BOOTCLASSPATH defined by system/core/rootdir/init.rc
- public static final String[] BOOTCLASSPATH = new String[] { "core",
+ public static final String[] BOOTCLASSPATH = new String[]
{ "core-libart",
"conscrypt",
"okhttp",
"core-junit",
@@ -55,7 +55,7 @@


public static final String[] HOST_BOOTCLASSPATH = new String[] {
- "core-hostdex",
+ "core-libart-hostdex",
"conscrypt-hostdex",
"okhttp-hostdex",
"bouncycastle-hostdex",
@@ -107,7 +107,7 @@
* <source>/out/host/linux-x86/bin/aapt
* <source>/out/host/linux-x86/bin/adb
* <source>/out/host/linux-x86/bin/dx
- *
<source>/out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar
+ *
<source>/out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.jar
*/

if ("platform-tools".equals(parentFileName)) {