From cf6a921f6075c5c338ed73cfbd7eb059acd9cd53 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Mon, 11 Apr 2022 05:05:45 +0000
Subject: [PATCH 1/2] Browser*: Migrate from makefile to blueprint

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 Browser/Android.bp        | 21 +++++++++++++++++++++
 Browser/Android.mk        | 13 -------------
 BrowserWebView/Android.bp | 26 ++++++++++++++++++++++++++
 BrowserWebView/Android.mk | 16 ----------------
 4 files changed, 47 insertions(+), 29 deletions(-)
 create mode 100644 Browser/Android.bp
 delete mode 100644 Browser/Android.mk
 create mode 100644 BrowserWebView/Android.bp
 delete mode 100644 BrowserWebView/Android.mk

diff --git a/Browser/Android.bp b/Browser/Android.bp
new file mode 100644
index 0000000..ea21b71
--- /dev/null
+++ b/Browser/Android.bp
@@ -0,0 +1,21 @@
+android_app_import {
+    name: "Browser",
+    certificate: "platform",
+
+    overrides: ["Jelly"],
+
+    arch: {
+        arm: {
+            apk: "ChromePublic_arm.apk",
+        },
+        arm64: {
+            apk: "ChromePublic_arm64.apk",
+        },
+        x86: {
+            apk: "ChromePublic_x86.apk",
+        },
+        x86_64: {
+            apk: "ChromePublic_x86_64.apk",
+        },
+    },
+}
diff --git a/Browser/Android.mk b/Browser/Android.mk
deleted file mode 100644
index 26e4ca0..0000000
--- a/Browser/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := Browser
-LOCAL_CERTIFICATE := platform
-LOCAL_MULTILIB := both
-LOCAL_OVERRIDES_PACKAGES := Jelly
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
-src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH))
-LOCAL_SRC_FILES := ChromePublic_$(src_arch).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/BrowserWebView/Android.bp b/BrowserWebView/Android.bp
new file mode 100644
index 0000000..7ad7244
--- /dev/null
+++ b/BrowserWebView/Android.bp
@@ -0,0 +1,26 @@
+android_app_import {
+    name: "BrowserWebView",
+    certificate: "platform",
+
+    overrides: ["webview"],
+
+    required: [
+        "libwebviewchromium_loader",
+        "libwebviewchromium_plat_support",
+    ],
+
+    arch: {
+        arm: {
+            apk: "SystemWebView_arm.apk",
+        },
+        arm64: {
+            apk: "SystemWebView_arm64.apk",
+        },
+        x86: {
+            apk: "SystemWebView_x86.apk",
+        },
+        x86_64: {
+            apk: "SystemWebView_x86_64.apk",
+        }
+    }
+}
diff --git a/BrowserWebView/Android.mk b/BrowserWebView/Android.mk
deleted file mode 100644
index 3bd554f..0000000
--- a/BrowserWebView/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := BrowserWebView
-LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
-LOCAL_MULTILIB := both
-LOCAL_OVERRIDES_PACKAGES := webview
-LOCAL_REQUIRED_MODULES := \
-        libwebviewchromium_loader \
-        libwebviewchromium_plat_support
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
-src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH))
-LOCAL_SRC_FILES := SystemWebView_$(src_arch).apk
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
-- 
GitLab


From aea3dfd13cf6c7538eee3c560cbab14f3e94a275 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
Date: Mon, 11 Apr 2022 05:07:39 +0000
Subject: [PATCH 2/2] Browser*: Migrate from system to product

Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
 Browser/Android.bp        | 2 ++
 BrowserWebView/Android.bp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Browser/Android.bp b/Browser/Android.bp
index ea21b71..7e4020b 100644
--- a/Browser/Android.bp
+++ b/Browser/Android.bp
@@ -4,6 +4,8 @@ android_app_import {
 
     overrides: ["Jelly"],
 
+    product_specific: true,
+
     arch: {
         arm: {
             apk: "ChromePublic_arm.apk",
diff --git a/BrowserWebView/Android.bp b/BrowserWebView/Android.bp
index 7ad7244..82d98d4 100644
--- a/BrowserWebView/Android.bp
+++ b/BrowserWebView/Android.bp
@@ -4,6 +4,8 @@ android_app_import {
 
     overrides: ["webview"],
 
+    product_specific: true,
+
     required: [
         "libwebviewchromium_loader",
         "libwebviewchromium_plat_support",
-- 
GitLab