From 9ee4b26e7146f8286949c69e24596e2af333e10e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 4 Oct 2017 05:50:59 +0000
Subject: Revert "Revert "Convert tagsoup to Android.bp""

This reverts commit 3dd55e6e758fd7aab0c539a18e71a31996e1910f.

Change-Id: I6a312f6f38a4f45d50a668d06bb55a886c70eb5a
---
 Android.bp | 20 ++++++++++++++++++++
 Android.mk | 31 -------------------------------
 2 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 Android.bp
 delete mode 100644 Android.mk

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5e0d542
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2014 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: "tagsoup",
+    host_supported: true,
+    no_framework_libs: true,
+    srcs: ["src/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 8f05250..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2014 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 := tagsouplib
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build a android library jar
-# ----------------------
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := tagsoup-android
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-- 
cgit v1.2.3