Snap for 4393550 from 1a8355695fba3066847bf2071bd2eeace5a19b09 to pi-release
Change-Id: I7c9a3927898fd1b61ed173f31d678c3c9510e491
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7d92bc7
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2009 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: "junit",
+ host_supported: true,
+ hostdex: true,
+ srcs: ["src/main/java/**/*.java"],
+ sdk_version: "25",
+ static_libs: ["hamcrest"],
+}
+
+// Legacy junit-host jar until references are updated
+java_library_host {
+ name: "junit-host",
+ static_libs: ["junit"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 77dd2de..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2009 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 a junit jar
-# ----------------------
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit
-LOCAL_MODULE_TAGS := tests
-LOCAL_SDK_VERSION := 25
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest
-# The following is needed by external/apache-harmony/jdwp/Android_debug_config.mk
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# build a junit-host jar
-# ----------------------
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit-host
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build a junit-hostdex jar
-# -------------------------
-
-ifeq ($(HOST_OS),linux)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_MODULE := junit-hostdex
-LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
-endif # HOST_OS == linux