From 7bafa6f36919c75289690f10a0f855c32f590453 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 21 Mar 2019 16:52:31 +0800
Subject: [PATCH] Utils: convert Android.mk to Android.bp

Since the framework.jar has been changed to use Android.bp,
we need to change analytics-utils to Android.bp as well.
---
 Android.mk       | 17 -----------------
 Utils/Android.bp | 16 ++++++++++++++++
 Utils/Android.mk | 13 -------------
 3 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 Android.mk
 create mode 100644 Utils/Android.bp
 delete mode 100644 Utils/Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e3d645d..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2016 Jide Technology Ltd.
-#
-# 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.
-#
-
-include $(call all-subdir-makefiles)
diff --git a/Utils/Android.bp b/Utils/Android.bp
new file mode 100644
index 0000000..60d6c37
--- /dev/null
+++ b/Utils/Android.bp
@@ -0,0 +1,16 @@
+// Utilities for Android-x86 Analytics
+//
+// Copyright (C) 2016-2019 Android-x86 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
+
+java_library_static {
+    name: "analytics-utils",
+    no_framework_libs: true,
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+}
diff --git a/Utils/Android.mk b/Utils/Android.mk
deleted file mode 100644
index 555f4fc..0000000
--- a/Utils/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Utilities for Android-x86 Analytics
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_MODULE := analytics-utils
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := $(PLATFORM_SDK_VERSION)
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-- 
2.11.0