SettingsRoboTests: Remove direct dep on sdk_vcurrent module.
Doesn't appear to be needed. If it was needed, the right way to depend on this module is to specify LOCAL_SDK_VERSION. This particular module is getting deleted soon. RunSettingsRoboTests hangs with and without this change, so I can't really test the runtime effects of this change, but I don't think there are any (local_java_libraries only affects compilation). Test: Can't test - RunSettingsRoboTests hangs with and without this change. Bug: 77525052 Change-Id: I116cd8e9676823b6670c162aa3bbdafa516001c5 Merged-In: I9df619c3d68f0af2ee2ae944a15998275129f7c2
This commit is contained in:
@@ -14,7 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
LOCAL_JAVA_LIBRARIES := \
|
||||
junit \
|
||||
platform-robolectric-prebuilt \
|
||||
sdk_vcurrent \
|
||||
telephony-common
|
||||
|
||||
LOCAL_INSTRUMENTATION_FOR := Settings
|
||||
@@ -40,4 +39,4 @@ LOCAL_TEST_PACKAGE := Settings
|
||||
|
||||
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
|
||||
|
||||
include prebuilts/misc/common/robolectric/run_robotests.mk
|
||||
include prebuilts/misc/common/robolectric/run_robotests.mk
|
||||
|
@@ -20,7 +20,6 @@ import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
|
||||
import android.test.mock.MockContentResolver;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.applications.PackageManagerWrapper;
|
||||
@@ -59,7 +58,6 @@ public class ShortcutServicePickerFragmentTest {
|
||||
private PackageManagerWrapper mPackageManager;
|
||||
|
||||
private ShortcutServicePickerFragment mFragment;
|
||||
private MockContentResolver mContentResolver;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
|
Reference in New Issue
Block a user