Merge "JLine: convert to soong" am: abf7aa1401 am: 667b8866db

am: 486ecfedc8

Change-Id: I25434bc1e240565149509548b39097962933f3bf

2 files changed, 18 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7276cca
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2011 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_import_host {
+  name: "jline-1.0",
+  jars: [ "jline-1.0.jar" ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 6fa3e55..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2011 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)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_PREBUILT_JAVA_LIBRARIES := jline-1.0:jline-1.0.jar
-
-include $(BUILD_MULTI_PREBUILT)