Match upstream file structure

Bug: 30946317
Test: make checkbuild and run cts CtsTextTestCases
Change-Id: I6c1773018f95855eb6599d66f6fb5923c7d48b03

57 files changed, 50 insertions, 33 deletions

diff --git a/Android.mk b/Android.mk
index 597a182..41a41d0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,5 @@
-# Copyright (C) 2012 The Android Open Source Project
+#
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,35 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-#
-
-LOCAL_PATH := $(call my-dir)
-
-# build for the host JVM
-#-----------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := hamcrest-host
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build for the host dalvik
-# -------------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := hamcrest-hostdex
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
-
-#-------------------------------
-# build a target jar
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := hamcrest
-LOCAL_SDK_VERSION := 25
-LOCAL_MODULE_TAGS := optional
-include $(BUILD_STATIC_JAVA_LIBRARY)
 
-include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(call all-subdir-makefiles)
diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk
new file mode 100644
index 0000000..a6acc8f
--- /dev/null
+++ b/hamcrest-core/Android.mk
@@ -0,0 +1,46 @@
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+
+LOCAL_PATH := $(call my-dir)
+
+# build for the host JVM
+#-----------------------
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_MODULE := hamcrest-host
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+# build for the host dalvik
+# -------------------------
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_MODULE := hamcrest-hostdex
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
+
+#-------------------------------
+# build a target jar
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
+LOCAL_MODULE := hamcrest
+LOCAL_SDK_VERSION := 25
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/src/org/hamcrest/BaseDescription.java b/hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java
index 4c98e5f..4c98e5f 100644
--- a/src/org/hamcrest/BaseDescription.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java
diff --git a/src/org/hamcrest/BaseMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/BaseMatcher.java
index 3fdd6f7..3fdd6f7 100644
--- a/src/org/hamcrest/BaseMatcher.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/BaseMatcher.java
diff --git a/src/org/hamcrest/CoreMatchers.java b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
index dd36acb..dd36acb 100644
--- a/src/org/hamcrest/CoreMatchers.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/CoreMatchers.java
diff --git a/src/org/hamcrest/Description.java b/hamcrest-core/src/main/java/org/hamcrest/Description.java
index 36ddeda..36ddeda 100644
--- a/src/org/hamcrest/Description.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/Description.java
diff --git a/src/org/hamcrest/Factory.java b/hamcrest-core/src/main/java/org/hamcrest/Factory.java
index a8bf5f9..a8bf5f9 100644
--- a/src/org/hamcrest/Factory.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/Factory.java
diff --git a/src/org/hamcrest/Matcher.java b/hamcrest-core/src/main/java/org/hamcrest/Matcher.java
index fd10207..fd10207 100644
--- a/src/org/hamcrest/Matcher.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/Matcher.java
diff --git a/src/org/hamcrest/MatcherAssert.java b/hamcrest-core/src/main/java/org/hamcrest/MatcherAssert.java
index 3eb234a..3eb234a 100644
--- a/src/org/hamcrest/MatcherAssert.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/MatcherAssert.java
diff --git a/src/org/hamcrest/SelfDescribing.java b/hamcrest-core/src/main/java/org/hamcrest/SelfDescribing.java
index cd53070..cd53070 100644
--- a/src/org/hamcrest/SelfDescribing.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/SelfDescribing.java
diff --git a/src/org/hamcrest/StringDescription.java b/hamcrest-core/src/main/java/org/hamcrest/StringDescription.java
index 66709ee..66709ee 100644
--- a/src/org/hamcrest/StringDescription.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/StringDescription.java
diff --git a/src/org/hamcrest/TypeSafeMatcher.java b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
index 7f18fd3..7f18fd3 100644
--- a/src/org/hamcrest/TypeSafeMatcher.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/TypeSafeMatcher.java
diff --git a/src/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
index f619a7d..f619a7d 100644
--- a/src/org/hamcrest/core/AllOf.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
diff --git a/src/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
index e7e9181..e7e9181 100644
--- a/src/org/hamcrest/core/AnyOf.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
diff --git a/src/org/hamcrest/core/DescribedAs.java b/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java
index 7b8c151..7b8c151 100644
--- a/src/org/hamcrest/core/DescribedAs.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/DescribedAs.java
diff --git a/src/org/hamcrest/core/Is.java b/hamcrest-core/src/main/java/org/hamcrest/core/Is.java
index f9152e9..f9152e9 100644
--- a/src/org/hamcrest/core/Is.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/Is.java
diff --git a/src/org/hamcrest/core/IsAnything.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java
index c5ca49d..c5ca49d 100644
--- a/src/org/hamcrest/core/IsAnything.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsAnything.java
diff --git a/src/org/hamcrest/core/IsEqual.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java
index b9f17c5..b9f17c5 100644
--- a/src/org/hamcrest/core/IsEqual.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java
diff --git a/src/org/hamcrest/core/IsInstanceOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
index df20824..df20824 100644
--- a/src/org/hamcrest/core/IsInstanceOf.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsInstanceOf.java
diff --git a/src/org/hamcrest/core/IsNot.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java
index cb6946c..cb6946c 100644
--- a/src/org/hamcrest/core/IsNot.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java
diff --git a/src/org/hamcrest/core/IsNull.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java
index 737dcf2..737dcf2 100644
--- a/src/org/hamcrest/core/IsNull.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsNull.java
diff --git a/src/org/hamcrest/core/IsSame.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java
index b3ad77e..b3ad77e 100644
--- a/src/org/hamcrest/core/IsSame.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/IsSame.java
diff --git a/src/org/hamcrest/core/package.html b/hamcrest-core/src/main/java/org/hamcrest/core/package.html
index 7bb0ffe..7bb0ffe 100644
--- a/src/org/hamcrest/core/package.html
+++ b/hamcrest-core/src/main/java/org/hamcrest/core/package.html
diff --git a/src/org/hamcrest/internal/ArrayIterator.java b/hamcrest-core/src/main/java/org/hamcrest/internal/ArrayIterator.java
index 093cdba..093cdba 100644
--- a/src/org/hamcrest/internal/ArrayIterator.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/internal/ArrayIterator.java
diff --git a/src/org/hamcrest/internal/SelfDescribingValue.java b/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValue.java
index 0634527..0634527 100644
--- a/src/org/hamcrest/internal/SelfDescribingValue.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValue.java
diff --git a/src/org/hamcrest/internal/SelfDescribingValueIterator.java b/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java
index 58bedf6..58bedf6 100644
--- a/src/org/hamcrest/internal/SelfDescribingValueIterator.java
+++ b/hamcrest-core/src/main/java/org/hamcrest/internal/SelfDescribingValueIterator.java
diff --git a/src/org/hamcrest/internal/package.html b/hamcrest-core/src/main/java/org/hamcrest/internal/package.html
index 1c9bf9d..1c9bf9d 100644
--- a/src/org/hamcrest/internal/package.html
+++ b/hamcrest-core/src/main/java/org/hamcrest/internal/package.html
diff --git a/src/org/hamcrest/package.html b/hamcrest-core/src/main/java/org/hamcrest/package.html
index 143c704..143c704 100644
--- a/src/org/hamcrest/package.html
+++ b/hamcrest-core/src/main/java/org/hamcrest/package.html
diff --git a/library/Android.mk b/hamcrest-library/Android.mk
index bdb4c58..bbb2a5c 100644
--- a/library/Android.mk
+++ b/hamcrest-library/Android.mk
@@ -23,7 +23,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
 
 LOCAL_MODULE := hamcrest-library
 LOCAL_JAVA_LIBRARIES := hamcrest
diff --git a/library/LICENSE.txt b/hamcrest-library/LICENSE.txt
index 5ebe92c..5ebe92c 100644
--- a/library/LICENSE.txt
+++ b/hamcrest-library/LICENSE.txt
diff --git a/library/README.android b/hamcrest-library/README.android
index dd099ed..dd099ed 100644
--- a/library/README.android
+++ b/hamcrest-library/README.android
diff --git a/library/build.gradle b/hamcrest-library/build.gradle
index 54ab15f..54ab15f 100644
--- a/library/build.gradle
+++ b/hamcrest-library/build.gradle
diff --git a/library/src/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
index ce550b5..ce550b5 100644
--- a/library/src/org/hamcrest/Matchers.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
diff --git a/library/src/org/hamcrest/collection/IsArray.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
index 6a26ef1..6a26ef1 100644
--- a/library/src/org/hamcrest/collection/IsArray.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArray.java
diff --git a/library/src/org/hamcrest/collection/IsArrayContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java
index 76ddf9d..76ddf9d 100644
--- a/library/src/org/hamcrest/collection/IsArrayContaining.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContaining.java
diff --git a/library/src/org/hamcrest/collection/IsCollectionContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionContaining.java
index ba98630..ba98630 100644
--- a/library/src/org/hamcrest/collection/IsCollectionContaining.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionContaining.java
diff --git a/library/src/org/hamcrest/collection/IsIn.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java
index 0a7bbb5..0a7bbb5 100644
--- a/library/src/org/hamcrest/collection/IsIn.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIn.java
diff --git a/library/src/org/hamcrest/collection/IsMapContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
index 74572dd..74572dd 100644
--- a/library/src/org/hamcrest/collection/IsMapContaining.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
diff --git a/library/src/org/hamcrest/collection/package.html b/hamcrest-library/src/main/java/org/hamcrest/collection/package.html
index 6248d8d..6248d8d 100644
--- a/library/src/org/hamcrest/collection/package.html
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/package.html
diff --git a/library/src/org/hamcrest/number/IsCloseTo.java b/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java
index dc183e8..dc183e8 100644
--- a/library/src/org/hamcrest/number/IsCloseTo.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/number/IsCloseTo.java
diff --git a/library/src/org/hamcrest/number/IsGreaterThan.java b/hamcrest-library/src/main/java/org/hamcrest/number/IsGreaterThan.java
index 34046b7..34046b7 100644
--- a/library/src/org/hamcrest/number/IsGreaterThan.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/number/IsGreaterThan.java
diff --git a/library/src/org/hamcrest/number/OrderingComparisons.java b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparisons.java
index 1791a40..1791a40 100644
--- a/library/src/org/hamcrest/number/OrderingComparisons.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/number/OrderingComparisons.java
diff --git a/library/src/org/hamcrest/number/package.html b/hamcrest-library/src/main/java/org/hamcrest/number/package.html
index 2fbb07f..2fbb07f 100644
--- a/library/src/org/hamcrest/number/package.html
+++ b/hamcrest-library/src/main/java/org/hamcrest/number/package.html
diff --git a/library/src/org/hamcrest/object/HasToString.java b/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java
index 0f12ffd..0f12ffd 100644
--- a/library/src/org/hamcrest/object/HasToString.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/object/HasToString.java
diff --git a/library/src/org/hamcrest/object/IsCompatibleType.java b/hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java
index 3a2dc7a..3a2dc7a 100644
--- a/library/src/org/hamcrest/object/IsCompatibleType.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/object/IsCompatibleType.java
diff --git a/library/src/org/hamcrest/object/IsEventFrom.java b/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java
index 504a8f5..504a8f5 100644
--- a/library/src/org/hamcrest/object/IsEventFrom.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java
diff --git a/library/src/org/hamcrest/object/package.html b/hamcrest-library/src/main/java/org/hamcrest/object/package.html
index 2fde62c..2fde62c 100644
--- a/library/src/org/hamcrest/object/package.html
+++ b/hamcrest-library/src/main/java/org/hamcrest/object/package.html
diff --git a/library/src/org/hamcrest/text/IsEqualIgnoringCase.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
index cc78c71..cc78c71 100644
--- a/library/src/org/hamcrest/text/IsEqualIgnoringCase.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringCase.java
diff --git a/library/src/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
index dd390e8..dd390e8 100644
--- a/library/src/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
diff --git a/library/src/org/hamcrest/text/StringContains.java b/hamcrest-library/src/main/java/org/hamcrest/text/StringContains.java
index 9e55560..9e55560 100644
--- a/library/src/org/hamcrest/text/StringContains.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/StringContains.java
diff --git a/library/src/org/hamcrest/text/StringEndsWith.java b/hamcrest-library/src/main/java/org/hamcrest/text/StringEndsWith.java
index 10e4764..10e4764 100644
--- a/library/src/org/hamcrest/text/StringEndsWith.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/StringEndsWith.java
diff --git a/library/src/org/hamcrest/text/StringStartsWith.java b/hamcrest-library/src/main/java/org/hamcrest/text/StringStartsWith.java
index 4613101..4613101 100644
--- a/library/src/org/hamcrest/text/StringStartsWith.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/StringStartsWith.java
diff --git a/library/src/org/hamcrest/text/SubstringMatcher.java b/hamcrest-library/src/main/java/org/hamcrest/text/SubstringMatcher.java
index 8ebe739..8ebe739 100644
--- a/library/src/org/hamcrest/text/SubstringMatcher.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/SubstringMatcher.java
diff --git a/library/src/org/hamcrest/text/X.java b/hamcrest-library/src/main/java/org/hamcrest/text/X.java
index 7e85bd9..7e85bd9 100644
--- a/library/src/org/hamcrest/text/X.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/X.java
diff --git a/library/src/org/hamcrest/text/package.html b/hamcrest-library/src/main/java/org/hamcrest/text/package.html
index 8cf576f..8cf576f 100644
--- a/library/src/org/hamcrest/text/package.html
+++ b/hamcrest-library/src/main/java/org/hamcrest/text/package.html
diff --git a/library/src/org/hamcrest/xml/HasXPath.java b/hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java
index 742935b..742935b 100644
--- a/library/src/org/hamcrest/xml/HasXPath.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/xml/HasXPath.java
diff --git a/library/src/org/hamcrest/xml/package.html b/hamcrest-library/src/main/java/org/hamcrest/xml/package.html
index d9c5f97..d9c5f97 100644
--- a/library/src/org/hamcrest/xml/package.html
+++ b/hamcrest-library/src/main/java/org/hamcrest/xml/package.html