Merged core/ and testrunner/ into a single directory.

Source files do not need to be split up in the unbundled branch.

Change-Id: I4ab82e111691a88b90265c2816fb902bbc8a3f8d

21 files changed, 3 insertions, 9 deletions

diff --git a/.classpath b/.classpath
index c916e44..c4c36bf 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="core"/>
-	<classpathentry kind="src" path="testrunner"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="UIAUTOMATOR_ROOT/prebuilts/sdk/current/android.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/Android.mk b/Android.mk
index 7d61619..897c6e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,16 +16,13 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-uiautomator.core_src_files := $(call all-java-files-under, testrunner) \
-    $(call all-java-files-under, core)
-
 uiautomator_internal_api_file := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/uiautomator_api.txt
 
 ###############################################
 # Build core library
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(uiautomator.core_src_files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE := ub-uiautomator
 LOCAL_SDK_VERSION := current
 
@@ -48,7 +45,7 @@ uiautomator_library := $(LOCAL_BUILT_MODULE)
 ###############################################
 # Generate the stub source files
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(uiautomator.core_src_files)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SDK_VERSION := current
 LOCAL_MODULE_CLASS := DOCS
 LOCAL_DROIDDOC_HTML_DIR :=
@@ -113,8 +110,6 @@ update-uiautomator-api: $(uiautomator_internal_api_file) | $(ACP)
 
 ###############################################
 # clean up temp vars
-uiautomator.core_src_files :=
-uiautomator.core_java_libraries :=
 uiautomator_stubs_stamp :=
 uiautomator_internal_api_file :=
 uiautomator_library :=
diff --git a/core/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java b/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
index 1884e06..1884e06 100644
--- a/core/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
+++ b/src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java
diff --git a/core/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java b/src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java
index 54835e3..54835e3 100644
--- a/core/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java
+++ b/src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java
diff --git a/core/com/android/uiautomator/core/Configurator.java b/src/com/android/uiautomator/core/Configurator.java
index 249f404..249f404 100644
--- a/core/com/android/uiautomator/core/Configurator.java
+++ b/src/com/android/uiautomator/core/Configurator.java
diff --git a/testrunner/com/android/uiautomator/core/InstrumentationUiAutomatorBridge.java b/src/com/android/uiautomator/core/InstrumentationUiAutomatorBridge.java
index 34e6d23..34e6d23 100644
--- a/testrunner/com/android/uiautomator/core/InstrumentationUiAutomatorBridge.java
+++ b/src/com/android/uiautomator/core/InstrumentationUiAutomatorBridge.java
diff --git a/core/com/android/uiautomator/core/InteractionController.java b/src/com/android/uiautomator/core/InteractionController.java
index 73e46f1..73e46f1 100644
--- a/core/com/android/uiautomator/core/InteractionController.java
+++ b/src/com/android/uiautomator/core/InteractionController.java
diff --git a/core/com/android/uiautomator/core/QueryController.java b/src/com/android/uiautomator/core/QueryController.java
index 6931528..6931528 100644
--- a/core/com/android/uiautomator/core/QueryController.java
+++ b/src/com/android/uiautomator/core/QueryController.java
diff --git a/core/com/android/uiautomator/core/Tracer.java b/src/com/android/uiautomator/core/Tracer.java
index d574fc0..d574fc0 100644
--- a/core/com/android/uiautomator/core/Tracer.java
+++ b/src/com/android/uiautomator/core/Tracer.java
diff --git a/core/com/android/uiautomator/core/UiAutomatorBridge.java b/src/com/android/uiautomator/core/UiAutomatorBridge.java
index bc5bc8e..bc5bc8e 100644
--- a/core/com/android/uiautomator/core/UiAutomatorBridge.java
+++ b/src/com/android/uiautomator/core/UiAutomatorBridge.java
diff --git a/core/com/android/uiautomator/core/UiCollection.java b/src/com/android/uiautomator/core/UiCollection.java
index e15beb2..e15beb2 100644
--- a/core/com/android/uiautomator/core/UiCollection.java
+++ b/src/com/android/uiautomator/core/UiCollection.java
diff --git a/core/com/android/uiautomator/core/UiDevice.java b/src/com/android/uiautomator/core/UiDevice.java
index 2a51109..2a51109 100644
--- a/core/com/android/uiautomator/core/UiDevice.java
+++ b/src/com/android/uiautomator/core/UiDevice.java
diff --git a/core/com/android/uiautomator/core/UiObject.java b/src/com/android/uiautomator/core/UiObject.java
index 4bb99cd..4bb99cd 100644
--- a/core/com/android/uiautomator/core/UiObject.java
+++ b/src/com/android/uiautomator/core/UiObject.java
diff --git a/core/com/android/uiautomator/core/UiObjectNotFoundException.java b/src/com/android/uiautomator/core/UiObjectNotFoundException.java
index fc0891b..fc0891b 100644
--- a/core/com/android/uiautomator/core/UiObjectNotFoundException.java
+++ b/src/com/android/uiautomator/core/UiObjectNotFoundException.java
diff --git a/core/com/android/uiautomator/core/UiScrollable.java b/src/com/android/uiautomator/core/UiScrollable.java
index a8d20c3..a8d20c3 100644
--- a/core/com/android/uiautomator/core/UiScrollable.java
+++ b/src/com/android/uiautomator/core/UiScrollable.java
diff --git a/core/com/android/uiautomator/core/UiSelector.java b/src/com/android/uiautomator/core/UiSelector.java
index bd61bfd..bd61bfd 100644
--- a/core/com/android/uiautomator/core/UiSelector.java
+++ b/src/com/android/uiautomator/core/UiSelector.java
diff --git a/core/com/android/uiautomator/core/UiWatcher.java b/src/com/android/uiautomator/core/UiWatcher.java
index 5403e30..5403e30 100644
--- a/core/com/android/uiautomator/core/UiWatcher.java
+++ b/src/com/android/uiautomator/core/UiWatcher.java
diff --git a/testrunner/com/android/uiautomator/testrunner/IAutomationSupport.java b/src/com/android/uiautomator/testrunner/IAutomationSupport.java
index f0c60d2..f0c60d2 100644
--- a/testrunner/com/android/uiautomator/testrunner/IAutomationSupport.java
+++ b/src/com/android/uiautomator/testrunner/IAutomationSupport.java
diff --git a/testrunner/com/android/uiautomator/testrunner/InstrumentationAutomationSupport.java b/src/com/android/uiautomator/testrunner/InstrumentationAutomationSupport.java
index a70586e..a70586e 100644
--- a/testrunner/com/android/uiautomator/testrunner/InstrumentationAutomationSupport.java
+++ b/src/com/android/uiautomator/testrunner/InstrumentationAutomationSupport.java
diff --git a/testrunner/com/android/uiautomator/testrunner/UiAutomatorInstrumentationTestRunner.java b/src/com/android/uiautomator/testrunner/UiAutomatorInstrumentationTestRunner.java
index ae763f2..ae763f2 100644
--- a/testrunner/com/android/uiautomator/testrunner/UiAutomatorInstrumentationTestRunner.java
+++ b/src/com/android/uiautomator/testrunner/UiAutomatorInstrumentationTestRunner.java
diff --git a/testrunner/com/android/uiautomator/testrunner/UiAutomatorTestCase.java b/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java
index b5f21c9..b5f21c9 100644
--- a/testrunner/com/android/uiautomator/testrunner/UiAutomatorTestCase.java
+++ b/src/com/android/uiautomator/testrunner/UiAutomatorTestCase.java