diff options
| author | Guang Zhu <guangzhu@google.com> | 2013-09-17 01:42:50 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2013-09-17 01:42:50 -0700 |
| commit | dc86da8036955064aa3f3767b3dd8e02aa273d72 (patch) | |
| tree | 30332995a8096ab6c1d4b64714759b6801f42208 | |
| parent | e056d9d08eddc0d64ac637b2f07cb0e4d6693c32 (diff) | |
| download | uiautomator-dc86da8036955064aa3f3767b3dd8e02aa273d72.tar.gz | |
initial build environment for unbundled UI Automator
Bug: 10793010
Change-Id: Ia52698ed2f90d9992a06433bba3045093ee7fa71
| -rw-r--r-- | Android.mk | 8 | ||||
| -rw-r--r-- | instrumentation/Android.mk | 2 |
2 files changed, 0 insertions, 10 deletions
@@ -14,12 +14,4 @@ # limitations under the License. # -# don't build uiautomator in unbundled env -ifndef TARGET_BUILD_APPS include $(call all-subdir-makefiles) -else -ifneq ($(filter uiautomator,$(TARGET_BUILD_APPS)),) -# used by the platform apps build. -include $(call all-subdir-makefiles) -endif -endif diff --git a/instrumentation/Android.mk b/instrumentation/Android.mk index 0c93b4c..e538519 100644 --- a/instrumentation/Android.mk +++ b/instrumentation/Android.mk @@ -21,9 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \ $(call all-java-files-under, ../library/core-src) -LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_MODULE := uiautomator-instrumentation -# TODO: change this to 18 when it's available LOCAL_SDK_VERSION := current include $(BUILD_STATIC_JAVA_LIBRARY) |