summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Rosenfeld <mrosenfeld@google.com>2017-06-13 17:05:50 -0700
committerMichael Rosenfeld <mrosenfeld@google.com>2017-06-14 00:32:39 +0000
commitddb7af8cbca0c722c33b4a7aafbb63c62a6ae4b8 (patch)
tree292567689494cf04c718f0c57e9183f84b713e31
parented76b3032931769fff6eee77dfb935335d884fb6 (diff)
downloadplatform_testing-ddb7af8cbca0c722c33b4a7aafbb63c62a6ae4b8.tar.gz
Remove old system-helper dependency.
Test: manual build Change-Id: I4518a9ed4f0edfe5102fcf92011b683417060878
-rw-r--r--libraries/app-helpers/common/Android.mk2
-rw-r--r--libraries/app-helpers/common/src/android/platform/test/helpers/common/test/HelperTest.java1
-rw-r--r--libraries/app-helpers/handheld/Android.mk2
3 files changed, 2 insertions, 3 deletions
diff --git a/libraries/app-helpers/common/Android.mk b/libraries/app-helpers/common/Android.mk
index 2a694d7eb..a3a370f71 100644
--- a/libraries/app-helpers/common/Android.mk
+++ b/libraries/app-helpers/common/Android.mk
@@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := app-helpers-common
-LOCAL_STATIC_JAVA_LIBRARIES := app-helpers-base system-helpers
+LOCAL_STATIC_JAVA_LIBRARIES := app-helpers-base
LOCAL_JAVA_LIBRARIES := ub-uiautomator android-support-test permission-utils-lib launcher-helper-lib
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/libraries/app-helpers/common/src/android/platform/test/helpers/common/test/HelperTest.java b/libraries/app-helpers/common/src/android/platform/test/helpers/common/test/HelperTest.java
index d87080bf0..eddb30dce 100644
--- a/libraries/app-helpers/common/src/android/platform/test/helpers/common/test/HelperTest.java
+++ b/libraries/app-helpers/common/src/android/platform/test/helpers/common/test/HelperTest.java
@@ -22,7 +22,6 @@ import android.platform.test.helpers.IStandardAppHelper;
import android.platform.test.helpers.listeners.FailureTestWatcher;
import android.support.test.InstrumentationRegistry;
import android.support.test.uiautomator.UiDevice;
-import android.system.helpers.PackageHelper;
import android.util.Log;
import org.junit.After;
diff --git a/libraries/app-helpers/handheld/Android.mk b/libraries/app-helpers/handheld/Android.mk
index d8f701723..623e0eed9 100644
--- a/libraries/app-helpers/handheld/Android.mk
+++ b/libraries/app-helpers/handheld/Android.mk
@@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := handheld-app-helper-base
LOCAL_STATIC_JAVA_LIBRARIES := app-helpers-common
-LOCAL_JAVA_LIBRARIES := ub-uiautomator
+LOCAL_JAVA_LIBRARIES := ub-uiautomator android-support-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)
include $(BUILD_STATIC_JAVA_LIBRARY)