diff options
Diffstat (limited to 'src/test')
4 files changed, 0 insertions, 161 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index f54d7d20b2..873d28bf1a 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -169,8 +169,6 @@ public final class BazelAnalysisMock extends AnalysisMock { " apksigner = ':ApkSignerBinary',", " dx = ':dx_binary',", " framework_aidl = ':aidl_framework',", - " jack = ':jack',", - " jill = ':jill',", " main_dex_classes = ':mainDexClasses.rules',", " main_dex_list_creator = ':main_dex_list_creator',", " proguard = ':ProGuard',", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 1da1347209..9019afd336 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -432,8 +432,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor'", ")", "java_library(", @@ -495,8 +493,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor'", ")", "java_library(", @@ -653,101 +649,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { } @Test - public void testDexesWithJackWhenFlagEnabled() throws Exception { - useConfiguration("--experimental_android_use_jack_for_dexing"); - scratch.file( - "java/com/google/android/BUILD", - "android_library(", - " name = 'dep',", - " srcs = ['dep.java']", - ")", - "android_library(", - " name = 'neverlink',", - " srcs = ['neverlink.java'],", - " neverlink = 1", - ")", - "java_plugin(", - " name = 'plugin',", - " srcs = ['plugin.java'],", - " processor_class = 'com.google.android.Plugin'", - ")", - "android_binary(", - " name = 'top',", - " srcs = ['foo.java', 'bar.srcjar'],", - " plugins = [':plugin'],", - " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**']),", - " deps = [':dep', ':neverlink'],", - ")"); - - ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top"); - Action jackDexAction = - getGeneratingAction( - artifactByPath( - ImmutableList.of(getCompressedUnsignedApk(topTarget)), ".apk", "classes.dex.zip")); - Iterable<String> jackDexInputs = ActionsTestUtil.baseArtifactNames(jackDexAction.getInputs()); - assertThat(jackDexInputs).containsAllOf("libtop.jack", "libdep.jack"); - assertThat(jackDexInputs).doesNotContain("libneverlink.jack"); - Artifact jackLibrary = getBinArtifact("libtop.jack", topTarget); - assertThat(ActionsTestUtil.baseArtifactNames(actionsTestUtil().artifactClosureOf(jackLibrary))) - .containsAllOf("foo.java", "bar.srcjar", "libplugin.jar"); - } - - @Test - public void testJackDexingIncludesProguardSpecsFromLibraries() throws Exception { - useConfiguration("--experimental_android_use_jack_for_dexing"); - scratch.file( - "java/com/google/android/BUILD", - "android_library(", - " name = 'dep',", - " srcs = ['dep.java'],", - " proguard_specs = ['transitive.pro'],", - ")", - "android_binary(", - " name = 'top',", - " srcs = ['foo.java', 'bar.srcjar'],", - " proguard_specs = ['direct.pro'],", - " manifest = 'AndroidManifest.xml',", - " deps = [':dep'],", - ")"); - - ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top"); - Action jackDexAction = - getGeneratingAction( - artifactByPath( - ImmutableList.of(getCompressedUnsignedApk(topTarget)), ".apk", "classes.dex.zip")); - Iterable<String> jackDexInputs = ActionsTestUtil.baseArtifactNames(jackDexAction.getInputs()); - assertThat(jackDexInputs).containsAllOf("transitive.pro_valid", "direct.pro"); - } - - @Test - public void testJackDexingOnNonProguardTargetHasNoProguardSpecsFromLibraries() throws Exception { - useConfiguration("--experimental_android_use_jack_for_dexing"); - scratch.file( - "java/com/google/android/BUILD", - "android_library(", - " name = 'dep',", - " srcs = ['dep.java'],", - " proguard_specs = ['transitive.pro'],", - ")", - "android_binary(", - " name = 'top',", - " srcs = ['foo.java', 'bar.srcjar'],", - " manifest = 'AndroidManifest.xml',", - " deps = [':dep'],", - ")"); - - ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top"); - - Action jackDexAction = - getGeneratingAction( - artifactByPath( - ImmutableList.of(getCompressedUnsignedApk(topTarget)), ".apk", "classes.dex.zip")); - Iterable<String> jackDexInputs = ActionsTestUtil.baseArtifactNames(jackDexAction.getInputs()); - assertThat(jackDexInputs).doesNotContain("transitive.pro_valid"); - } - - @Test public void testV1SigningMethod() throws Exception { actualSignerToolTests("v1", "true", "false"); } @@ -781,8 +682,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor')"); scratch.file("java/com/google/android/hello/BUILD", "android_binary(name = 'hello',", @@ -2107,8 +2006,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor')"); scratch.file("java/a/BUILD", @@ -2148,8 +2045,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor')"); scratch.file("java/a/BUILD", @@ -2192,8 +2087,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor')"); scratch.file("java/a/BUILD", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index 52cd935e2e..e0789e24d1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -99,45 +99,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { } @Test - public void testExportsJackProvider() throws Exception { - scratch.file( - "java/com/google/android/BUILD", - "android_library(", - " name = 'dep',", - " srcs = ['dep.java']", - ")", - "android_library(", - " name = 'neverlink',", - " srcs = ['neverlink.java'],", - " neverlink = 1", - ")", - "java_plugin(", - " name = 'plugin',", - " srcs = ['plugin.java'],", - " processor_class = 'com.google.android.Plugin'", - ")", - "android_library(", - " name = 'top',", - " srcs = ['foo.java', 'bar.srcjar'],", - " plugins = [':plugin'],", - " deps = [':dep', ':neverlink'],", - ")"); - - ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top"); - JackLibraryProvider jackProvider = topTarget.getProvider(JackLibraryProvider.class); - Iterable<String> classpathNames = - ActionsTestUtil.baseArtifactNames(jackProvider.getTransitiveJackClasspathLibraries()); - Iterable<String> runtimeNames = - ActionsTestUtil.baseArtifactNames(jackProvider.getTransitiveJackLibrariesToLink()); - assertThat(classpathNames).containsAllOf("libtop.jack", "libdep.jack", "libneverlink.jack"); - assertThat(runtimeNames).containsAllOf("libtop.jack", "libdep.jack"); - assertThat(runtimeNames).doesNotContain("libneverlink.jack"); - Artifact jackLibrary = getBinArtifact("libtop.jack", topTarget); - assertThat(ActionsTestUtil.baseArtifactNames(actionsTestUtil().artifactClosureOf(jackLibrary))) - .containsAllOf("foo.java", "bar.srcjar", "libplugin.jar"); - } - - @Test public void testSlashInIdlImportRoot() throws Exception { scratchConfiguredTarget("java/com/google/android", "avocado", "android_library(name='avocado',", @@ -613,8 +574,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " jack = 'jack',", - " jill = 'jill',", " resource_extractor = 'resource_extractor')", "java_library(name = 'aidl_lib',", " srcs = ['AidlLib.java'],", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java index 6e30dfe06e..022cd7ad5e 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java @@ -24,9 +24,6 @@ import com.google.devtools.build.lib.actions.util.LabelArtifactOwner; import com.google.devtools.build.lib.analysis.FilesToRunProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; -import com.google.devtools.build.lib.collect.nestedset.NestedSet; -import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.vfs.FileSystem; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.util.FileSystems; @@ -58,8 +55,6 @@ public class ApkManifestActionTest { null, // aidlLib, optional createArtifact("/workspace/androidsdk/androidJar"), createArtifact("/workspace/androidsdk/shrinkedAndroidJar"), - createNestedSet(createArtifact("/workspace/androidsdk/androidBaseClasspathForJack")), - createNestedSet(createArtifact("/workspace/androidsdk/javaBaseClasspathForJack")), createArtifact("/workspace/androidsdk/annotationsJar"), createArtifact("/workspace/androidsdk/mainDexClasses"), createFilesToRunProvider("adb"), @@ -71,8 +66,6 @@ public class ApkManifestActionTest { createFilesToRunProvider("apkSigner"), createFilesToRunProvider("proguard"), createFilesToRunProvider("zipalign"), - createFilesToRunProvider("jack"), - createFilesToRunProvider("jill"), createFilesToRunProvider("resourceExtractor")); Iterable<Artifact> jars1 = ImmutableList.of( @@ -144,10 +137,6 @@ public class ApkManifestActionTest { } } - private NestedSet<Artifact> createNestedSet(Artifact artifact) { - return NestedSetBuilder.create(Order.STABLE_ORDER, artifact); - } - private FilesToRunProvider createFilesToRunProvider(String name) { return new FilesToRunProvider(null, null, createArtifact("/workspace/androidsdk/" + name)); } |