From c74ce0e7f17a7cc02efd01d1cdd8d44ddb3dfa43 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Sun, 12 Sep 2021 20:44:17 +0200 Subject: sdm660-common: libhidl: Move to Android.bp * Make the lib vendor_available and remove it from vndk-ext Change-Id: I3945a460d563aaf07aaa7b757bb9c0dddc4f91cd --- libhidl/Android.bp | 12 ++++++++++++ libhidl/Android.mk | 20 -------------------- sdm660.mk | 1 + vndk/vndk-ext-libs.mk | 1 - 4 files changed, 13 insertions(+), 21 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 0000000..56cf318 --- /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 87c4f7d..0000000 --- a/libhidl/Android.mk +++ /dev/null @@ -1,20 +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) diff --git a/sdm660.mk b/sdm660.mk index 47a17f0..6400d9b 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -240,6 +240,7 @@ endif # HIDL PRODUCT_PACKAGES += \ android.hidl.base@1.0 \ + android.hidl.base@1.0.vendor \ libhidltransport \ libhidltransport.vendor \ libhwbinder \ diff --git a/vndk/vndk-ext-libs.mk b/vndk/vndk-ext-libs.mk index a4f4de8..4c8b801 100644 --- a/vndk/vndk-ext-libs.mk +++ b/vndk/vndk-ext-libs.mk @@ -1,3 +1,2 @@ EXTRA_VENDOR_LIBRARIES := \ - android.hidl.base@1.0 \ libpowermanager -- cgit v1.2.3