From 18f76093fadc9e0bedc60fc7f2292c29d5982014 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Fri, 18 Feb 2022 16:14:48 +0900
Subject: [PATCH] universal7885: camera.provider: Rebrand to exynos7885

* Also, use our hidden cam number (50)

Change-Id: I4d7a11b32c260d32dcd9427a98ac4c6ef94c1e03
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 .../hidl/camera/provider/Android.bp           | 25 +++----------------
 .../camera/provider/SamsungCameraProvider.cpp |  5 +---
 ...camera.provider@2.5-service.exynos7885.rc} |  2 +-
 3 files changed, 5 insertions(+), 27 deletions(-)
 rename universal7885-common/hidl/camera/provider/{android.hardware.camera.provider@2.5-service_64.exynos9820.rc => android.hardware.camera.provider@2.5-service.exynos7885.rc} (89%)

diff --git a/universal7885-common/hidl/camera/provider/Android.bp b/universal7885-common/hidl/camera/provider/Android.bp
index eb78253..7b67c29 100644
--- a/universal7885-common/hidl/camera/provider/Android.bp
+++ b/universal7885-common/hidl/camera/provider/Android.bp
@@ -13,38 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
-soong_config_module_type {
-    name: "exynos9820_model",
-    module_type: "cc_defaults",
-    config_namespace: "exynos9820CameraVars",
-    value_variables: ["exynos9820_model"],
-    properties: ["cppflags"],
-}
-
-exynos9820_model {
-    name: "exynos9820_model_defaults",
-    soong_config_variables: {
-        exynos9820_model: {
-            cppflags: ["-DEXYNOS9820_MODEL_%s"],
-        },
-    },
-}
-
 cc_binary {
-    name: "android.hardware.camera.provider@2.5-service_64.exynos9820",
+    name: "android.hardware.camera.provider@2.5-service.exynos7885",
     defaults: [
         "hidl_defaults",
-        "exynos9820_model_defaults",
     ],
-    compile_multilib: "64",
+    compile_multilib: "32",
     proprietary: true,
     relative_install_path: "hw",
     srcs: [
         "SamsungCameraProvider.cpp",
         "service.cpp"
     ],
-    init_rc: ["android.hardware.camera.provider@2.5-service_64.exynos9820.rc"],
+    init_rc: ["android.hardware.camera.provider@2.5-service.exynos7885.rc"],
     shared_libs: [
         "android.hardware.camera.provider@2.4",
         "android.hardware.camera.provider@2.4-legacy",
diff --git a/universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp b/universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp
index fb2ad7e..cfca718 100644
--- a/universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp
+++ b/universal7885-common/hidl/camera/provider/SamsungCameraProvider.cpp
@@ -26,10 +26,7 @@ using ::android::OK;
 const int kMaxCameraIdLen = 16;
 
 SamsungCameraProvider::SamsungCameraProvider() : LegacyCameraProviderImpl_2_5() {
-#ifndef EXYNOS9820_MODEL_beyond0lte
-    // ID=52 is telephoto
-    mExtraIDs.push_back(52);
-#endif
+    mExtraIDs.push_back(50);
 
     if (!mInitFailed) {
         for (int i : mExtraIDs) {
diff --git a/universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service_64.exynos9820.rc b/universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
similarity index 89%
rename from universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service_64.exynos9820.rc
rename to universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
index 5a29bbc..ed5fd41 100644
--- a/universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service_64.exynos9820.rc
+++ b/universal7885-common/hidl/camera/provider/android.hardware.camera.provider@2.5-service.exynos7885.rc
@@ -1,4 +1,4 @@
-service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service_64.exynos9820
+service vendor.camera-provider-2-5 /vendor/bin/hw/android.hardware.camera.provider@2.5-service.exynos7885
     interface android.hardware.camera.provider@2.5::ICameraProvider legacy/0
     interface android.hardware.camera.provider@2.4::ICameraProvider legacy/0
     class hal