lisa/android_device_xiaomi_sm8350-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sm6250-common: Get rid of megvii dependencies in camera.qcom.so"

Browse Source 
* doesn't work anymore

This reverts commit f8e46f5022.
This commit is contained in:
Volodymyr Zhdanov 2020-11-22 00:25:17 +01:00 committed by Demon000
parent 57ef6285a5
commit d96b060c7d
4 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
camera/Android.bp
View File

@ -1,21 +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.
cc_library_shared {
name: "libshim_megvii",
proprietary: true,
srcs: ["megvii_shim.cpp"],
}

19
camera/megvii_shim.cpp
View File

@ -1,19 +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.
*/
namespace android {
extern "C" void mg_facepp() {}
}

4
common.mk
View File

@ -112,10 +112,6 @@ PRODUCT_PACKAGES += \
libgui_vendor \ libgui_vendor \
Snap Snap
PRODUCT_PACKAGES += \
libshim_megvii
# Camera
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.camera.provider@2.4-impl \ android.hardware.camera.provider@2.4-impl \
android.hardware.camera.provider@2.4-service_64 android.hardware.camera.provider@2.4-service_64

10
extract-files.sh
View File

@ -49,16 +49,6 @@ if [ -z "${SRC}" ]; then
SRC="adb" SRC="adb"
fi fi
function blob_fixup() {
case "${1}" in
vendor/lib64/hw/camera.qcom.so)
$PATCHELF --remove-needed "libMegviiFacepp-0.5.2.so" "${2}"
$PATCHELF --remove-needed "libmegface.so" "${2}"
$PATCHELF --add-needed "libshim_megvii.so" "${2}"
;;
esac
}
# Initialize the helper for common device # Initialize the helper for common device
setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}" setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"