From f3b06ef8a06188110ca43001b977e0fbf860abf9 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 22 Sep 2016 10:54:15 -0700
Subject: [PATCH] Fix compile error when robotests references R.* in Settings

Test: make SettingsRoboTests
Change-Id: I85c8bb1b83fa9d1f487658b1bc5dc080f70efa2f
---
 tests/robotests/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index dff619a877d..edc810f114b 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -14,9 +14,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 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