diff options
| author |  Googler <noreply@google.com> | 2017-11-20 13:13:39 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-20 13:17:30 -0800 |
| commit | 0b30976d6a075577e9a9fc9df37ee4e784bb0ebb (patch) | |
| tree | 9209ebcc6de79d71cd5516209f131653e58fa593 /src/test/java/com | |
| parent | bff599bba6ace59104dbc5a5de17164b5fe25d1c (diff) | |
Remove experimental flags for generating robolectric R class.
RELNOTES: none
PiperOrigin-RevId: 176405273
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AbstractAndroidLocalTestTest.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 1 |
2 files changed, 1 insertions, 4 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 54c0b76965..45169cfa6f 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 @@ -62,9 +62,7 @@ public abstract class AbstractAndroidLocalTestTest extends BuildViewTestCase { @Test public void testOneVersionEnforcement() throws Exception { - useConfiguration( - "--experimental_one_version_enforcement=error", - "--experimental_android_generate_robolectric_r_class"); + useConfiguration("--experimental_one_version_enforcement=error"); writeFile("java/test/resource/BUILD", "android_local_test(name = 'dummyTest',", " srcs = ['test.java'],", 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 b8ddd21da4..02cf5ef73f 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 @@ -1551,7 +1551,6 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " manifest = 'a/AndroidManifest.xml',", " resource_files = [ 'res/values/a.xml' ]", ")"); - useConfiguration("--experimental_use_manifest_from_resource_apk"); ConfiguredTarget target = getConfiguredTarget("//java/a:a"); |