Load default libraries from jack.jar

For now the only default library contains the jack annotations.
The default libraries can be ignored by "--no-default-libraries".

Bug: 17803510
Change-Id: I0eb0c1a535e1d4ff808c744ba7c1924e4dd4aee6

5 files changed, 30 insertions, 16 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java
index 8e1db1f..65dc3d4 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchainBase.java
@@ -62,7 +62,6 @@ public abstract class JackApiToolchainBase extends JackBasedToolchain {
   @Nonnull
   private static String compilerVersion;
 
-
   @Nonnull
   public static String getReleaseName() {
     return releaseName;
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java
index 0927650..bd9e202 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiV01Toolchain.java
@@ -49,6 +49,7 @@ public class JackApiV01Toolchain extends JackApiToolchainBase {
   JackApiV01Toolchain(@Nonnull File jackPrebuilt) {
     super(jackPrebuilt, Api01Config.class);
     apiV01Config = (Api01Config) config;
+    addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
   }
 
   @Override
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
index b7ef689..0aab263 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java
@@ -61,6 +61,7 @@ public class JackCliToolchain extends JackBasedToolchain {
   public JackCliToolchain setVerbose(boolean isVerbose) {
     super.setVerbose(isVerbose);
     verbosityLevel = isVerbose ? VerbosityLevel.DEBUG : VerbosityLevel.WARNING;
+    addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
     return this;
   }
 
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
index 1725143..29fa563 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
+++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
@@ -19,6 +19,7 @@ package com.android.jack.fileconflict;
 
 import com.android.jack.JackAbortException;
 import com.android.jack.Options.VerbosityLevel;
+import com.android.jack.backend.jayce.ImportConflictException;
 import com.android.jack.backend.jayce.JayceFileImporter;
 import com.android.jack.backend.jayce.TypeImportConflictException;
 import com.android.jack.library.FileType;
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
index 5b65a07..c7512ba 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
@@ -18,6 +18,7 @@ package com.android.jack.multidex;
 
 import com.google.common.io.Files;
 
+import com.android.jack.Options;
 import com.android.jack.backend.dex.DexFileWriter;
 import com.android.jack.backend.dex.MultiDexLegacy;
 import com.android.jack.comparator.DifferenceFoundException;
@@ -37,6 +38,7 @@ import com.android.jack.test.toolchain.IToolchain;
 import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.test.toolchain.LegacyJillToolchain;
+import com.android.jack.test.toolchain.JackCliToolchain;
 import com.android.sched.util.TextUtils;
 
 import junit.framework.Assert;
@@ -99,6 +101,7 @@ public class MultiDexTests {
 
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(testFolder);
@@ -106,8 +109,8 @@ public class MultiDexTests {
     env.setCandidateTestTools(toolchain);
 
     List<File> cp = new ArrayList<File>();
-    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(annotations);
+    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(frameworks);
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
@@ -125,13 +128,14 @@ public class MultiDexTests {
         AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(testFolder);
     env.setCandidateTestTools(toolchain);
     List<File> cp = new ArrayList<File>();
-    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(annotations);
+    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(frameworks);
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
@@ -151,13 +155,14 @@ public class MultiDexTests {
         AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(testFolder);
     env.setCandidateTestTools(toolchain);
     List<File> cp = new ArrayList<File>();
-    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(annotations);
+    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(frameworks);
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
@@ -173,11 +178,12 @@ public class MultiDexTests {
   public void versionedTest001a_withoutAnnotations() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackCliToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackCliToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -192,10 +198,11 @@ public class MultiDexTests {
   public void versionedTest001b_minimal_withoutAnnotations() throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackCliToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackCliToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -210,14 +217,14 @@ public class MultiDexTests {
 
   @Test
   public void versionedTest001c_withoutAnnotations() throws Exception {
-
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack");
     File out = AbstractTestTools.createTempDir();
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
+    JackCliToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackCliToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -327,6 +334,7 @@ public class MultiDexTests {
         AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(annotations)
@@ -345,7 +353,6 @@ public class MultiDexTests {
     Assert.assertFalse(classes3Dex.exists());
     int totalTypeNumber = getTypeCountInDex(classesDex) + getTypeCountInDex(classes2Dex);
     Assert.assertEquals(100, totalTypeNumber);
-    return;
   }
 
   @Test
@@ -359,6 +366,7 @@ public class MultiDexTests {
     addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp"));
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(library);
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(toolchain.getDefaultBootClasspath())
@@ -378,7 +386,6 @@ public class MultiDexTests {
     ListingComparator.compare(
         new File(testFolder,"ref-list-002-2.txt"), outList2);
     Assert.assertFalse(new File(out, "classes3.dex").exists());
-    return;
   }
 
   @Test
@@ -396,13 +403,14 @@ public class MultiDexTests {
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(autoLibrary);
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(testFolder);
     env.setCandidateTestTools(toolchain);
     List<File> cp = new ArrayList<File>();
-    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(annotations);
+    cp.addAll(Arrays.asList(toolchain.getDefaultBootClasspath()));
     cp.add(frameworks);
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
@@ -420,10 +428,11 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+    JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackCliToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder,"config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -446,11 +455,12 @@ public class MultiDexTests {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack");
     File out = AbstractTestTools.createTempDir();
 
-    JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+    JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackCliToolchain.class);
     addCommonOptionsForMultiDex(toolchain, new File(testFolder,"config-001.jpp"));
 
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(library);
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -480,10 +490,11 @@ public class MultiDexTests {
     List<Class<? extends IToolchain>> exclude = new ArrayList<Class<? extends IToolchain>>();
     exclude.add(LegacyJillToolchain.class);
     JackBasedToolchain toolchain =
-        AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude);
+        AbstractTestTools.getCandidateToolchain(JackCliToolchain.class, exclude);
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
     toolchain.addStaticLibs(autoLibrary);
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(frameworks)
@@ -510,6 +521,7 @@ public class MultiDexTests {
     JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
     toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true");
     toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex");
+    toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false");
 
     toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
     .addToClasspath(annotations)