From 126c94e443f520ec58cca53407bad0469afe5367 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Thu, 22 Oct 2020 14:38:37 +0530 Subject: [PATCH] sm6250-common: Convert libhidl to blueprint Change-Id: Ief105a44eeb403b2fa41d391a0d72c776da13248 --- common.mk | 4 ++-- libhidl/Android.bp | 26 ++++++++++++++++++++++++++ libhidl/Android.mk | 46 ---------------------------------------------- 3 files changed, 28 insertions(+), 48 deletions(-) create mode 100644 libhidl/Android.bp delete mode 100644 libhidl/Android.mk diff --git a/common.mk b/common.mk index 8b9e3ae..0e0d296 100644 --- a/common.mk +++ b/common.mk @@ -175,9 +175,9 @@ PRODUCT_PACKAGES += \ # HIDL PRODUCT_PACKAGES += \ android.hidl.base@1.0 \ - android.hidl.base@1.0_system \ + android.hidl.base@1.0.vendor \ android.hidl.manager@1.0 \ - android.hidl.manager@1.0_system + android.hidl.manager@1.0.vendor PRODUCT_PACKAGES += \ libhidltransport \ diff --git a/libhidl/Android.bp b/libhidl/Android.bp new file mode 100644 index 0000000..32e375b --- /dev/null +++ b/libhidl/Android.bp @@ -0,0 +1,26 @@ +// +// Copyright (C) 2020 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. + +cc_library_shared { + name: "android.hidl.base@1.0", + shared_libs: ["libhidlbase"], + vendor_available: true, +} + +cc_library_shared { + name: "android.hidl.manager@1.0", + shared_libs: ["libhidlbase"], + vendor_available: true, +} diff --git a/libhidl/Android.mk b/libhidl/Android.mk deleted file mode 100644 index 9d405a4..0000000 --- a/libhidl/Android.mk +++ /dev/null @@ -1,46 +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_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.base@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.manager@1.0 -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.base@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.base@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := libhidltransport -LOCAL_MODULE := android.hidl.manager@1.0_system -LOCAL_INSTALLED_MODULE_STEM := android.hidl.manager@1.0.so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -include $(BUILD_SHARED_LIBRARY)