diff options
| -rwxr-xr-x | extract-files.sh | 4 | ||||
| -rw-r--r-- | libshims/Android.mk | 23 | ||||
| -rwxr-xr-x | msm8996.mk | 3 |
3 files changed, 3 insertions, 27 deletions
diff --git a/extract-files.sh b/extract-files.sh index 13c54b6..39e8a1e 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -77,14 +77,14 @@ function blob_fixup() { # Patch libmmcamera2_stats_modules vendor/lib/libmmcamera2_stats_modules.so) - sed -i "s|libgui.so|libfui.so|g" "${2}" sed -i "s|/data/misc/camera|/data/vendor/qcam|g" "${2}" "${PATCHELF}" --remove-needed libandroid.so "${2}" + "${PATCHELF}" --remove-needed libgui.so "${2}" ;; # Patch blobs for VNDK vendor/lib/libmmcamera_ppeiscore.so) - sed -i "s|libgui.so|libfui.so|g" "${2}" + "${PATCHELF}" --remove-needed libgui.so "${2}" ;; vendor/lib/libmpbase.so) "${PATCHELF}" --remove-needed libandroid.so "${2}" diff --git a/libshims/Android.mk b/libshims/Android.mk deleted file mode 100644 index e53e508..0000000 --- a/libshims/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# 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) @@ -140,8 +140,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl:32 \ android.hardware.camera.provider@2.4-service \ - camera.msm8996 \ - libfui + camera.msm8996 # Common init scripts PRODUCT_PACKAGES += \ |