| commit | 9dc66275e0ec05aa72677b3e41ac1c6a18bbebdf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 22 20:31:57 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 22 20:31:57 2016 +0000 |
| tree | 23e86627897a224845bac28ef15d9db3ee84ad1f | |
| parent | 5b9762bc09cf72193a9aca498bf28c447a79b5da [diff] | |
| parent | f3b06ef8a06188110ca43001b977e0fbf860abf9 [diff] |
Merge "Fix compile error when robotests references R.* in Settings"
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index dff619a..edc810f 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk
@@ -14,9 +14,9 @@ LOCAL_JAVA_LIBRARIES := \ junit4-target \ platform-robolectric-prebuilt \ - sdk_v23 + sdk_vcurrent -LOCAL_APK_LIBRARIES = Settings +LOCAL_INSTRUMENTATION_FOR := Settings LOCAL_MODULE := SettingsRoboTests LOCAL_MODULE_TAGS := optional