Merge changes from topic "junit-soong" am: 9f35e340ac am: a87b7d3237android-wear-8.0.0_r1

am: 86c71ca379

Change-Id: Ic60a751a94c52f160eece5bc3542f2ff4449f4d0

6 files changed, 67 insertions, 96 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ec07728
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2017 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.
+//
+//
+
+subdirs = [
+    "hamcrest-core",
+    "hamcrest-library",
+]
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 41a41d0..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# 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.
-# 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.
-#
-
-include $(call all-subdir-makefiles)
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
new file mode 100644
index 0000000..711ebfe
--- /dev/null
+++ b/hamcrest-core/Android.bp
@@ -0,0 +1,23 @@
+// 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.
+//
+//
+
+java_library_static {
+    name: "hamcrest",
+    host_supported: true,
+    hostdex: true,
+    srcs: ["src/main/java/**/*.java"],
+    sdk_version: "25",
+}
diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk
deleted file mode 100644
index a6acc8f..0000000
--- a/hamcrest-core/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/hamcrest-library/Android.bp b/hamcrest-library/Android.bp
new file mode 100644
index 0000000..c91c7c6
--- /dev/null
+++ b/hamcrest-library/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2014 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.
+//
+//
+
+java_library_static {
+    name: "hamcrest-library",
+    host_supported: true,
+    srcs: ["src/main/java/**/*.java"],
+
+    libs: ["hamcrest"],
+    sdk_version: "8",
+}
diff --git a/hamcrest-library/Android.mk b/hamcrest-library/Android.mk
deleted file mode 100644
index bbb2a5c..0000000
--- a/hamcrest-library/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2014 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)
-
-# TODO: add host and hostdex jars
-
-#-------------------------------
-# build a target jar
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-
-LOCAL_MODULE := hamcrest-library
-LOCAL_JAVA_LIBRARIES := hamcrest
-LOCAL_SDK_VERSION := 8
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_JAVA_LIBRARY)