diff options
| author |  Googler <noreply@google.com> | 2017-11-21 05:57:15 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-21 05:58:44 -0800 |
| commit | bb60ca44caff02f8c21678b860a4526a3b5beac5 (patch) | |
| tree | e5e37f599222f9468b30d5ad4b2b8789cac3cdc7 /src/test | |
| parent | 34d02ef1a47cdb7847fdd12e96d7532dc7e0d7df (diff) | |
Update AndroidConfiguration to reflect changes
RELNOTES: none
PiperOrigin-RevId: 176496770
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 43 |
2 files changed, 0 insertions, 45 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java index 45169cfa6f..3544d0974d 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java @@ -185,8 +185,6 @@ public abstract class AbstractAndroidLocalTestTest extends BuildViewTestCase { final String libraryOne = "dummyLibraryOne"; final String libraryTwo = "dummyLibraryTwo"; - useConfiguration("--noexperimental_android_include_library_resource_jars"); - checkForCorrectLibraries( "no-runtime", Arrays.asList(libraryOne), Collections.<String>emptyList()); checkForCorrectLibraries( 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 cb31bf76ec..eebd097d06 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 @@ -1911,9 +1911,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " srcs =['bin.java'],", " )"); - // TODO(b/37087277): Remove this once this behavior is the default - useConfiguration("--noexperimental_android_include_library_resource_jars"); - Action deployJarAction = getGeneratingAction( getFileConfiguredTarget("//java/r/android:bin_deploy.jar").getArtifact()); @@ -1930,46 +1927,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { } @Test - public void testInheritedRInRuntimeJarsWhenSpecified() throws Exception { - String dir = "java/r/android/"; - scratch.file( - dir + "BUILD", - "android_library(name = 'sublib',", - " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res3/**']),", - " srcs =['sublib.java'],", - " )", - "android_library(name = 'lib',", - " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res2/**']),", - " deps = [':sublib'],", - " srcs =['lib.java'],", - " )", - "android_binary(name = 'bin',", - " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**']),", - " deps = [':lib'],", - " srcs =['bin.java'],", - " )"); - - useConfiguration("--experimental_android_include_library_resource_jars"); - - Action deployJarAction = - getGeneratingAction( - getFileConfiguredTarget("//java/r/android:bin_deploy.jar").getArtifact()); - List<String> inputs = ActionsTestUtil.baseArtifactNames(deployJarAction.getInputs()); - - assertThat(inputs) - .containsAllOf( - "libsublib.jar_desugared.jar", - "liblib.jar_desugared.jar", - "libbin.jar_desugared.jar", - "bin_resources.jar_desugared.jar", - "lib_resources.jar_desugared.jar", - "sublib_resources.jar_desugared.jar"); - } - - @Test public void testLocalResourcesUseRClassGenerator() throws Exception { scratch.file("java/r/android/BUILD", "android_library(name = 'lib',", |