From aa9a8b92a3b21f6fab05fac706e5115885c07b45 Mon Sep 17 00:00:00 2001 From: adi8900 Date: Thu, 9 Jun 2022 08:30:01 +0000 Subject: [PATCH] Revert "davinci: Get rid of megvii dependencies in camera.qcom.so" * we are going to build stub packages. This reverts commit 333c63ad41fabe9e60d5230528162109ec876f63. Signed-off-by: adi8900 --- camera/Android.bp | 21 --------------------- camera/megvii_shim.cpp | 19 ------------------- device.mk | 3 --- 3 files changed, 43 deletions(-) delete mode 100644 camera/Android.bp delete mode 100644 camera/megvii_shim.cpp diff --git a/camera/Android.bp b/camera/Android.bp deleted file mode 100644 index 61d5bbe..0000000 --- a/camera/Android.bp +++ /dev/null @@ -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"], -} diff --git a/camera/megvii_shim.cpp b/camera/megvii_shim.cpp deleted file mode 100644 index 02e05dc..0000000 --- a/camera/megvii_shim.cpp +++ /dev/null @@ -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() {} -} diff --git a/device.mk b/device.mk index 9f71547..16f0355 100644 --- a/device.mk +++ b/device.mk @@ -36,9 +36,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ vendor.xiaomi.hardware.motor@1.0.vendor -PRODUCT_PACKAGES += \ - libshim_megvii - # Init scripts PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/init.davinci.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.davinci.rc