diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-10-25 05:30:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-25 05:30:54 +0000 |
| commit | 753b9472c59c04f15251329914b9c2b6b516392d (patch) | |
| tree | 7ee12b4da1744ae9727b4ed9b4525cdb497a8fb7 | |
| parent | 222107507d126c33bd48647fb92e0b4021fb861f (diff) | |
| parent | 46208530f8862f7dc770a4c24f1f39004c4fb36e (diff) | |
| download | interfaces-753b9472c59c04f15251329914b9c2b6b516392d.tar.gz | |
Move libwifikeystorehal to Android.bp. am: 6a1726a444
am: 46208530f8
Change-Id: I540494a88ca1197e6562ef2d76d6ae68e1915d21
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | wifi/keystore/1.0/default/Android.bp | 21 | ||||
| -rw-r--r-- | wifi/keystore/1.0/default/Android.mk | 33 |
3 files changed, 22 insertions, 33 deletions
@@ -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) |