From 1607c907ddd839ca154b4bb6772be1ab483f2a28 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Tue, 14 Sep 2021 16:24:25 +0800 Subject: [PATCH] sdm660-common: libhidl: Move to Android.bp Change-Id: Ia046de0c051aa7533d602714c7d882a079973808 --- libhidl/Android.bp | 12 ++++++++++++ libhidl/Android.mk | 28 ---------------------------- sdm660.mk | 2 +- 3 files changed, 13 insertions(+), 29 deletions(-) create mode 100644 libhidl/Android.bp delete mode 100644 libhidl/Android.mk diff --git a/libhidl/Android.bp b/libhidl/Android.bp new file mode 100644 index 00000000..56cf3182 --- /dev/null +++ b/libhidl/Android.bp @@ -0,0 +1,12 @@ +// +// Copyright (C) 2021 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_shared { + name: "android.hidl.base@1.0", + shared_libs: ["libhidlbase"], + system_ext_specific: true, + vendor_available: true, +} diff --git a/libhidl/Android.mk b/libhidl/Android.mk deleted file mode 100644 index cd354c30..00000000 --- a/libhidl/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2017 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. - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hidl.base@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hidl.base@1.0_vendor -LOCAL_INSTALLED_MODULE_STEM := android.hidl.base@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) diff --git a/sdm660.mk b/sdm660.mk index 12ccea6c..19c094f2 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -277,7 +277,7 @@ PRODUCT_PACKAGES += \ # HIDL PRODUCT_PACKAGES += \ android.hidl.base@1.0 \ - android.hidl.base@1.0_vendor \ + android.hidl.base@1.0.vendor \ libhidltransport \ libhidltransport.vendor \ libhwbinder \