From eea1518a3f3b13ff26a8067f6112cc10362a76d1 Mon Sep 17 00:00:00 2001
From: Henrique Silva <jhenrique09.mcz@hotmail.com>
Date: Mon, 9 Sep 2019 20:11:20 +0200
Subject: [PATCH] sdm660-common: switch WfdCommon to blueprint

---
 Android.bp           | 24 ++++++++++++++++++++++++
 Android.mk           | 10 ----------
 BoardConfigVendor.mk |  2 ++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..2ae1846
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2018-2019 The LineageOS 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.
+
+// This file is generated by device/xiaomi/msm8998-common/setup-makefiles.sh
+
+soong_namespace {
+}
+
+dex_import {
+    name: "WfdCommon",
+    owner: "xiaomi",
+    jars: ["proprietary/framework/WfdCommon.jar"],
+}
diff --git a/Android.mk b/Android.mk
index 49ac90e..ae3b290 100644
--- a/Android.mk
+++ b/Android.mk
@@ -313,16 +313,6 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := .jar
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := WfdCommon
-LOCAL_MODULE_OWNER := xiaomi
-LOCAL_SRC_FILES := proprietary/framework/WfdCommon.jar
-LOCAL_CERTIFICATE := platform
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := chargeonlymode
 LOCAL_MODULE_OWNER := xiaomi
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index 6e97a4a..5bfb58d 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -14,3 +14,5 @@
 
 # This file is generated by device/xiaomi/sdm660-common/setup-makefiles.sh
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/xiaomi/sdm660-common