Merge "Match upstream file structure" am: 5d9cc8c989 am: b5937e4be3 am: 11a97a2ff7
am: 1dfb5bbe24
Change-Id: Ib4f853674ae97e7d7b4e3cef05e2668ef514e045
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
similarity index 100%
rename from src/org/hamcrest/BaseDescription.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/BaseMatcher.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/CoreMatchers.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/Description.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/Factory.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/Matcher.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/MatcherAssert.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/SelfDescribing.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/StringDescription.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/TypeSafeMatcher.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/AllOf.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/AnyOf.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/DescribedAs.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/Is.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsAnything.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsEqual.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsInstanceOf.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsNot.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsNull.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/IsSame.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/core/package.html
rename to 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
similarity index 100%
rename from src/org/hamcrest/internal/ArrayIterator.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/internal/SelfDescribingValue.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/internal/SelfDescribingValueIterator.java
rename to 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
similarity index 100%
rename from src/org/hamcrest/internal/package.html
rename to 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
similarity index 100%
rename from src/org/hamcrest/package.html
rename to hamcrest-core/src/main/java/org/hamcrest/package.html
diff --git a/library/Android.mk b/hamcrest-library/Android.mk
similarity index 93%
rename from library/Android.mk
rename to hamcrest-library/Android.mk
index bdb4c58..bbb2a5c 100644
--- a/library/Android.mk
+++ b/hamcrest-library/Android.mk
@@ -23,7 +23,7 @@
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
similarity index 100%
rename from library/LICENSE.txt
rename to hamcrest-library/LICENSE.txt
diff --git a/library/README.android b/hamcrest-library/README.android
similarity index 100%
rename from library/README.android
rename to hamcrest-library/README.android
diff --git a/library/build.gradle b/hamcrest-library/build.gradle
similarity index 100%
rename from library/build.gradle
rename to hamcrest-library/build.gradle
diff --git a/library/src/org/hamcrest/Matchers.java b/hamcrest-library/src/main/java/org/hamcrest/Matchers.java
similarity index 100%
rename from library/src/org/hamcrest/Matchers.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/IsArray.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/IsArrayContaining.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/IsCollectionContaining.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/IsIn.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/IsMapContaining.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/collection/package.html
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/number/IsCloseTo.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/number/IsGreaterThan.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/number/OrderingComparisons.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/number/package.html
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/object/HasToString.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/object/IsCompatibleType.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/object/IsEventFrom.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/object/package.html
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/IsEqualIgnoringCase.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/IsEqualIgnoringWhiteSpace.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/StringContains.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/StringEndsWith.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/StringStartsWith.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/SubstringMatcher.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/X.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/text/package.html
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/xml/HasXPath.java
rename to 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
similarity index 100%
rename from library/src/org/hamcrest/xml/package.html
rename to hamcrest-library/src/main/java/org/hamcrest/xml/package.html
