sdm710-common: Build separate system and vendor HIDL libs

and cleanup sdm710.mk

Change-Id: If8e2211e643bdb0ff67fb248e7fe33b78077a06e
This commit is contained in:
Demon000 2021-08-16 12:33:00 +02:00 committed by Giammarco Senatore
parent d5172c8756
commit 6687ec44b2
No known key found for this signature in database
GPG key ID: 661348FC1E144F04
3 changed files with 50 additions and 11 deletions

View file

@ -1,5 +0,0 @@
cc_library {
name: "android.hidl.base@1.0",
shared_libs: ["libhidlbase"],
vendor_available: true,
}

46
libhidl/Android.mk Normal file
View file

@ -0,0 +1,46 @@
#
# 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)

View file

@ -183,6 +183,10 @@ PRODUCT_PACKAGES += \
# HIDL
PRODUCT_PACKAGES += \
android.hidl.base@1.0 \
android.hidl.base@1.0_system \
android.hidl.manager@1.0 \
android.hidl.manager@1.0_system \
libhidltransport \
libhidltransport.vendor \
libhwbinder \
@ -194,12 +198,6 @@ PRODUCT_PACKAGES += \
libqcomfm_jni \
qcom.fmradio
# HIDL
PRODUCT_PACKAGES += \
android.hidl.base@1.0 \
android.hidl.base@1.0.vendor \
libhidltransport
# IMS
PRODUCT_PACKAGES += \
ims-ext-common \