diff options
author | Colin Cross <ccross@android.com> | 2017-10-11 21:47:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 21:47:48 +0000 |
commit | 833c14eda2691fa92267a5b5ee03180c7b8110fc (patch) | |
tree | b3af45f2ae79df714024717672083fad9fbbf134 | |
parent | df26755a810a785f3ebf21b8aaff6769076f035f (diff) | |
parent | 885334531ac5ed3033608af0168ec97a04622379 (diff) | |
download | junit-833c14eda2691fa92267a5b5ee03180c7b8110fc.tar.gz |
Merge "Convert external/junit to Android.bp"android-o-mr1-iot-preview-6o-mr1-iot-preview-6
am: 885334531a
Change-Id: Ia34bb6364ad04f69ee9efa1c28c2b55bcfbddaf5
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | Android.mk | 54 |
2 files changed, 30 insertions, 54 deletions
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 |