From d80d320e67a01f3b46195f747aba6d42052ddbc7 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Sat, 18 Dec 2021 20:21:27 -0500
Subject: [PATCH] google_pixel: Re-introduce GoogleCamera

* Only build on Pixels
* Use the old marlin/sailfish GoogleCamera to maintain
  compatibility, newer Pixels will be prompted to update
  the app via the Play Store.
* Also, use Android.bp to avoid included static library
  checks.

Change-Id: I6845f1feeee7a432bc24ae03996c1622399e9f78
---
 apps/Android.bp | 11 +++++++++++
 apps/Android.mk | 13 -------------
 2 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 apps/Android.bp

diff --git a/apps/Android.bp b/apps/Android.bp
new file mode 100644
index 0000000..af7cb90
--- /dev/null
+++ b/apps/Android.bp
@@ -0,0 +1,11 @@
+android_app_import {
+        name: "GoogleCamera",
+        owner: "google",
+        apk: "apks/GoogleCamera.apk",
+        overrides: ["Camera2", "Snap"],
+        presigned: true,
+        dex_preopt: {
+                enabled: false,
+        },
+        product_specific: true,
+}
diff --git a/apps/Android.mk b/apps/Android.mk
index f0930ee..1156e8a 100644
--- a/apps/Android.mk
+++ b/apps/Android.mk
@@ -26,19 +26,6 @@ LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk
 LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleCamera
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_DEX_PREOPT := false
-LOCAL_SRC_FILES := apks/$(LOCAL_MODULE).apk
-LOCAL_OVERRIDES_PACKAGES := Camera Camera2 MotCamera Snap
-LOCAL_PRODUCT_MODULE := true
-LOCAL_OPTIONAL_USES_LIBRARIES := org.apache.http.legacy
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleExtServices
 LOCAL_MODULE_OWNER := google