From bc256cb2e01a1b977490dd3fae9c1a52b5da4778 Mon Sep 17 00:00:00 2001 From: Davide Garberi Date: Sun, 26 Jan 2020 14:11:30 +0100 Subject: msm8996-common: Switch libfui to makefile compiled * This allows us to have it actually working and no prebuilt blob is needed Change-Id: Id8331bc109dcce1b2776c70bce453c6ac3ec02bb --- libshims/Android.mk | 23 +++++++++++++++++++++++ msm8996.mk | 3 ++- proprietary-files.txt | 3 --- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 libshims/Android.mk diff --git a/libshims/Android.mk b/libshims/Android.mk new file mode 100644 index 0000000..e53e508 --- /dev/null +++ b/libshims/Android.mk @@ -0,0 +1,23 @@ +# 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. + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_STATIC_LIBRARES := libgui +LOCAL_MODULE := libfui +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_VENDOR_MODULE := true +include $(BUILD_SHARED_LIBRARY) diff --git a/msm8996.mk b/msm8996.mk index f6591a9..96f60f7 100755 --- a/msm8996.mk +++ b/msm8996.mk @@ -134,7 +134,8 @@ PRODUCT_PACKAGES += \ camera.msm8996 \ mm-qcamera-app \ Snap \ - libmm-qcamera + libmm-qcamera \ + libfui # CNE PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 4f44047..38b024c 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -228,9 +228,6 @@ vendor/lib/libchromatix_ov8865_video_full.so vendor/lib/libchromatix_ov8865_zsl_preview.so vendor/lib/libchromatix_ov8865_zsl_video.so -# Camera vndk hax - from Lineage 16.0 build -vendor/lib/libfui.so|caca4e5a117958ee6b424b66ba4ba8ffd9d41ea0 - # CNE - from LA.UM.8.6.r1-01900-89xx.0 etc/cne/Nexus/ATT/ATT_profiles.xml|33e568627fd3f94dc45bca1c01ad10e6d8fb5b52 etc/cne/Nexus/ROW/ROW_profiles.xml|238e785e9674b27c4b2365958d127533d7293132 -- cgit v1.2.3