AetherDroid/android_device_samsung_universal7570-common
1
0
Fork 0
mirror of https://github.com/AetherDroid/android_device_samsung_universal7570-common.git synced 2025-09-04 15:37:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

universal7870: rework shims

Browse source
This commit is contained in:
Alejandro 2020-05-30 15:36:17 +02:00
parent 262ba103ef
commit 35f2b6d077
4 changed files with 39 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BoardConfigCommon.mk
View file

@ -186,17 +186,9 @@ PRODUCT_FULL_TREBLE_OVERRIDE := true
PRODUCT_VENDOR_MOVE_ENABLED := true PRODUCT_VENDOR_MOVE_ENABLED := true
BOARD_VNDK_VERSION := current BOARD_VNDK_VERSION := current
# Shims # Shim
TARGET_LD_SHIM_LIBS += \ TARGET_LD_SHIM_LIBS += \
/vendor/lib/libcamera_client.so|/vendor/lib/libcamera_client_shim.so \ /system/bin/mediaserver|/system/lib/libstagefright_shim.so
/vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so|/vendor/lib/libui_shim.so \
/vendor/lib/libexynoscamera.so|/vendor/lib/libexynoscamera_shim.so
# Wifi # Wifi
BOARD_HAVE_SAMSUNG_WIFI := true BOARD_HAVE_SAMSUNG_WIFI := true

3
device-common.mk
View file

@ -262,9 +262,8 @@ PRODUCT_PACKAGES += \
# Shims # Shims
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libcamera_client_shim \
libexynoscamera_shim \ libexynoscamera_shim \
libui_shim libstagefright_shim
# USB # USB
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

36
shims/libstagefright/Android.bp Normal file
View file

@ -0,0 +1,36 @@
cc_library_shared {
name: "libstagefright_shim",
srcs: [
"CameraSource.cpp",
],
export_shared_lib_headers: [
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.bufferqueue@2.0",
],
generated_headers: [
"android.hardware.graphics.bufferqueue@1.0_genc++_headers",
"android.hardware.graphics.bufferqueue@2.0_genc++_headers",
],
shared_libs: [
"android.hardware.graphics.bufferqueue@1.0",
"android.hardware.graphics.bufferqueue@2.0",
"android.hidl.token@1.0-utils",
"libbase",
"libcamera_client",
"liblog",
],
include_dirs: [
"frameworks/av/include",
"frameworks/native/include/media/hardware",
"frameworks/native/include/media/openmax",
"frameworks/native/libs/arect/include",
"frameworks/native/libs/nativebase/include",
"frameworks/native/libs/nativewindow/include",
"frameworks/av/media/ndk/include",
],
}

43
shims/libstagefright/Android.mk
View file

@ -1,43 +0,0 @@
#
# Copyright (C) 2018 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_SRC_FILES := CameraSource.cpp
LOCAL_C_INCLUDES := \
$(TOP)/frameworks/av/include \
$(TOP)/frameworks/native/include/media/hardware \
$(TOP)/frameworks/native/include/media/openmax \
$(TOP)/frameworks/native/libs/arect/include \
$(TOP)/frameworks/native/libs/nativebase/include \
$(TOP)/frameworks/native/libs/nativewindow/include \
$(TOP)/frameworks/av/media/ndk/include
LOCAL_SHARED_LIBRARIES := \
android.hardware.graphics.bufferqueue@1.0 \
android.hardware.graphics.bufferqueue@2.0 \
android.hidl.token@1.0-utils \
libbase \
libcamera_client \
liblog
LOCAL_MODULE := libstagefright_shim
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_SHARED_LIBRARY)