From cb07136ea2fb7bfbe32e937a0601dd4a72383395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosme=20Dom=C3=ADnguez=20D=C3=ADaz?= Date: Sun, 22 Apr 2018 11:16:14 +0200 Subject: msm8996-common: libhidl: Back to Android Makefile. * @faizauthar12 had issues using Soong with libhidl on his buildbot and I don't mind use one or other build system. This is a partial revert of 7fc8c30651b2a0889cc6dc84fe76e150167c6cbe. --- libhidl/Android.bp | 18 ------------------ libhidl/Android.mk | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 libhidl/Android.bp create mode 100644 libhidl/Android.mk (limited to 'libhidl') diff --git a/libhidl/Android.bp b/libhidl/Android.bp deleted file mode 100644 index 7b93840..0000000 --- a/libhidl/Android.bp +++ /dev/null @@ -1,18 +0,0 @@ -cc_library_shared { - name: "android.hidl.base@1.0", - shared_libs: [ - "libhidltransport", - ], - export_shared_lib_headers: [ - "libhidltransport", - ], -} -cc_library_shared { - name: "android.hidl.manager@1.0", - shared_libs: [ - "libhidltransport", - ], - export_shared_lib_headers: [ - "libhidltransport", - ], -} diff --git a/libhidl/Android.mk b/libhidl/Android.mk new file mode 100644 index 0000000..428655c --- /dev/null +++ b/libhidl/Android.mk @@ -0,0 +1,28 @@ +# +# 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 +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 +include $(BUILD_SHARED_LIBRARY) -- cgit v1.2.3