diff options
| author | Colin Cross <ccross@android.com> | 2018-08-13 15:39:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-13 15:39:53 -0700 |
| commit | c3252da8b40faeae3ff7ca559aec7979282f457c (patch) | |
| tree | 4f6c39314249fcb8ee44f7518a047dc224faa93d | |
| parent | 045fe1a003805f21f4bd266ab202319486a90284 (diff) | |
| parent | ba337231c16317f0ab950e9bf7a16f926c84a9d9 (diff) | |
| download | easymock-c3252da8b40faeae3ff7ca559aec7979282f457c.tar.gz | |
Merge "Convert easymock to Android.bp" am: f166eb43fb am: ae63fc4832
am: ba337231c1
Change-Id: Ie90f94a974da63d3659c44966b7dbbcc64001da8
| -rw-r--r-- | Android.bp | 28 | ||||
| -rw-r--r-- | Android.mk | 35 |
2 files changed, 28 insertions, 35 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..2821414 --- /dev/null +++ b/Android.bp @@ -0,0 +1,28 @@ +// Copyright (C) 2010 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 { + name: "easymock", + host_supported: true, + srcs: ["src/**/*.java"], + sdk_version: "9", +} + +java_library { + name: "easymocklib", + static_libs: ["easymock"], + sdk_version: "9", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 39f93ac..0000000 --- a/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2010 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 an easymock.jar to use for host side tests -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MODULE := easymock - -include $(BUILD_HOST_JAVA_LIBRARY) - -# Build an easymocklib.jar to use on device -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_SDK_VERSION := 9 -LOCAL_MODULE := easymocklib - -include $(BUILD_STATIC_JAVA_LIBRARY) |