From 6a1726a4446d1861f33a30c5ce27becfb4cffba9 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 23 Oct 2017 10:35:31 -0600
Subject: [PATCH] Move libwifikeystorehal to Android.bp.

Test: builds, boots
Bug: 67041047
Change-Id: I18a7647c250a7817c289b77166fbf6f49db78686
Merged-In: I18a7647c250a7817c289b77166fbf6f49db78686
(cherry picked from commit 5a0869bf4adaa99f7d46c56d4a4cbf8d82acce2b)
---
 Android.bp                           |  1 +
 wifi/keystore/1.0/default/Android.bp | 21 +++++++++++++++++++++
 wifi/keystore/1.0/default/Android.mk | 33 ---------------------------------
 3 files changed, 22 insertions(+), 33 deletions(-)
 create mode 100644 wifi/keystore/1.0/default/Android.bp
 delete mode 100644 wifi/keystore/1.0/default/Android.mk

diff --git a/Android.bp b/Android.bp
index 64fdde4..878f5ad 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,5 +3,6 @@ subdirs = [
     "net/netd/1.0",
     "net/netd/1.0/vts/functional",
     "wifi/keystore/1.0",
+    "wifi/keystore/1.0/default",
     "wifi/keystore/1.0/vts/functional",
 ]
diff --git a/wifi/keystore/1.0/default/Android.bp b/wifi/keystore/1.0/default/Android.bp
new file mode 100644
index 0000000..e6cb6df
--- /dev/null
+++ b/wifi/keystore/1.0/default/Android.bp
@@ -0,0 +1,21 @@
+cc_library_shared {
+    name: "libwifikeystorehal",
+    cppflags: [
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+    ],
+    srcs: ["keystore.cpp"],
+    shared_libs: [
+        "android.system.wifi.keystore@1.0",
+        "libbase",
+        "libbinder",
+        "libcutils",
+        "libhidlbase",
+        "libhidltransport",
+        "libkeystore_binder",
+        "liblog",
+        "libutils",
+    ],
+    export_include_dirs: ["include"],
+}
diff --git a/wifi/keystore/1.0/default/Android.mk b/wifi/keystore/1.0/default/Android.mk
deleted file mode 100644
index 415387f..0000000
--- a/wifi/keystore/1.0/default/Android.mk
+++ /dev/null
@@ -1,33 +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)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwifikeystorehal
-LOCAL_CPPFLAGS := -Wall -Werror -Wextra
-LOCAL_SRC_FILES := \
-    keystore.cpp
-LOCAL_SHARED_LIBRARIES := \
-    android.system.wifi.keystore@1.0 \
-    libbase \
-    libbinder \
-    libcutils \
-    libhidlbase \
-    libhidltransport \
-    libkeystore_binder \
-    liblog \
-    libutils
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-include $(BUILD_SHARED_LIBRARY)
-- 
2.11.0