summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-08-17 09:07:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-17 09:07:24 -0700
commitf830c9f19d6b1b7f3930f58673819748ae1734c5 (patch)
tree5f26191a916640adf81cf12e406ad833c2c7acc7
parent799e0e134b61f160f69fbf84d5cbf24861e5e78e (diff)
parentc1f1a186566b1140f17d1367916a39eee7543213 (diff)
downloadmockftpserver-f830c9f19d6b1b7f3930f58673819748ae1734c5.tar.gz
Convert external/mockftpserver to Android.bp
am: c1f1a18656 Change-Id: Ie3dfd15e90f4ea164681de3d0d3bd084f6705324
-rw-r--r--Android.bp26
-rw-r--r--Android.mk37
2 files changed, 26 insertions, 37 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a3d586b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,26 @@
+//
+// 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.
+//
+
+java_library {
+ name: "mockftpserver",
+ hostdex: true,
+ srcs: ["MockFtpServer/src/main/java/**/*.java"],
+ java_resource_dirs: ["MockFtpServer/src/main/resources"],
+
+ libs: ["slf4j-jdk14"],
+
+ sdk_version: "core_current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 6e38ab2..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# 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.
-#
-LOCAL_PATH := $(call my-dir)
-
-mockftpserver_src_files := $(call all-java-files-under,MockFtpServer/src/main/java)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(mockftpserver_src_files)
-LOCAL_JAVA_RESOURCE_DIRS := MockFtpServer/src/main/resources
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := mockftpserver
-LOCAL_JAVA_LIBRARIES := slf4j-jdk14
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_SDK_VERSION := core_current
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(mockftpserver_src_files)
-LOCAL_JAVA_RESOURCE_DIRS := MockFtpServer/src/main/resources
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := mockftpserver-hostdex
-LOCAL_JAVA_LIBRARIES := slf4j-jdk14-hostdex
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)