Update Bromite to v102.0.5005.96
* And switch to 7z for compression
* Command used: for APK in *.apk; do 7z a -txz -v100m $APK.xz $APK && rm $APK; done
Change-Id: I3875b30de3a544bc6d55c91360617cbec18b5f88
diff --git a/Android.mk b/Android.mk
index a0b5d67..97b7591 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,13 +22,8 @@
LOCAL_MODULE_CLASS := APPS
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_OVERRIDES_PACKAGES := webview
-LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH)_SystemWebView.apk
-include $(BUILD_PREBUILT)
-
-$(PRODUCT_OUT)/obj/BROMITE/$(TARGET_ARCH)_ChromePublic.apk: $(MINIGZIP)
- @rm -rf $(dir $@)
- @mkdir -p $(dir $@)
- @$(MINIGZIP) -c -d packages/apps/Bromite/prebuilt/$(TARGET_ARCH)_ChromePublic.apk.gz > $@
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH)_SystemWebView.apk.xz.001
+include vendor/leaf/build/core/7z_prebuilt.mk
include $(CLEAR_VARS)
LOCAL_CERTIFICATE := PRESIGNED
@@ -36,5 +31,5 @@
LOCAL_MODULE_CLASS := APPS
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_OVERRIDES_PACKAGES := Browser2
-LOCAL_SRC_FILES := ../../../$(PRODUCT_OUT)/obj/BROMITE/$(TARGET_ARCH)_ChromePublic.apk
-include $(BUILD_PREBUILT)
+LOCAL_SRC_FILES := prebuilt/$(TARGET_ARCH)_ChromePublic.apk.xz.001
+include vendor/leaf/build/core/7z_prebuilt.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
deleted file mode 100644
index b741e17..0000000
--- a/CleanSpec.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2022 The LeafOS 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.
-#
-
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/BROMITE)
diff --git a/prebuilt/arm64_ChromePublic.apk.gz b/prebuilt/arm64_ChromePublic.apk.gz
deleted file mode 100644
index 735263c..0000000
--- a/prebuilt/arm64_ChromePublic.apk.gz
+++ /dev/null
Binary files differ
diff --git a/prebuilt/arm64_ChromePublic.apk.xz.001 b/prebuilt/arm64_ChromePublic.apk.xz.001
new file mode 100644
index 0000000..6d9916b
--- /dev/null
+++ b/prebuilt/arm64_ChromePublic.apk.xz.001
Binary files differ
diff --git a/prebuilt/arm64_SystemWebView.apk b/prebuilt/arm64_SystemWebView.apk
deleted file mode 100644
index f975101..0000000
--- a/prebuilt/arm64_SystemWebView.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/arm64_SystemWebView.apk.xz.001 b/prebuilt/arm64_SystemWebView.apk.xz.001
new file mode 100644
index 0000000..839eefa
--- /dev/null
+++ b/prebuilt/arm64_SystemWebView.apk.xz.001
Binary files differ
diff --git a/prebuilt/arm_ChromePublic.apk.gz b/prebuilt/arm_ChromePublic.apk.gz
deleted file mode 100644
index f7b61fc..0000000
--- a/prebuilt/arm_ChromePublic.apk.gz
+++ /dev/null
Binary files differ
diff --git a/prebuilt/arm_ChromePublic.apk.xz.001 b/prebuilt/arm_ChromePublic.apk.xz.001
new file mode 100644
index 0000000..4c27a9c
--- /dev/null
+++ b/prebuilt/arm_ChromePublic.apk.xz.001
Binary files differ
diff --git a/prebuilt/arm_SystemWebView.apk b/prebuilt/arm_SystemWebView.apk
deleted file mode 100644
index d4d1622..0000000
--- a/prebuilt/arm_SystemWebView.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/arm_SystemWebView.apk.xz.001 b/prebuilt/arm_SystemWebView.apk.xz.001
new file mode 100644
index 0000000..c8e319e
--- /dev/null
+++ b/prebuilt/arm_SystemWebView.apk.xz.001
Binary files differ
diff --git a/prebuilt/x86_64_ChromePublic.apk.gz b/prebuilt/x86_64_ChromePublic.apk.gz
deleted file mode 100644
index 5c318a8..0000000
--- a/prebuilt/x86_64_ChromePublic.apk.gz
+++ /dev/null
Binary files differ
diff --git a/prebuilt/x86_64_ChromePublic.apk.xz.001 b/prebuilt/x86_64_ChromePublic.apk.xz.001
new file mode 100644
index 0000000..e2c6eae
--- /dev/null
+++ b/prebuilt/x86_64_ChromePublic.apk.xz.001
Binary files differ
diff --git a/prebuilt/x86_64_SystemWebView.apk b/prebuilt/x86_64_SystemWebView.apk
deleted file mode 100644
index ef8a1f5..0000000
--- a/prebuilt/x86_64_SystemWebView.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/x86_64_SystemWebView.apk.xz.001 b/prebuilt/x86_64_SystemWebView.apk.xz.001
new file mode 100644
index 0000000..512fa1d
--- /dev/null
+++ b/prebuilt/x86_64_SystemWebView.apk.xz.001
Binary files differ
diff --git a/prebuilt/x86_ChromePublic.apk.gz b/prebuilt/x86_ChromePublic.apk.gz
deleted file mode 100644
index 41d1686..0000000
--- a/prebuilt/x86_ChromePublic.apk.gz
+++ /dev/null
Binary files differ
diff --git a/prebuilt/x86_ChromePublic.apk.xz.001 b/prebuilt/x86_ChromePublic.apk.xz.001
new file mode 100644
index 0000000..625ae6d
--- /dev/null
+++ b/prebuilt/x86_ChromePublic.apk.xz.001
Binary files differ
diff --git a/prebuilt/x86_SystemWebView.apk b/prebuilt/x86_SystemWebView.apk
deleted file mode 100644
index 49779f3..0000000
--- a/prebuilt/x86_SystemWebView.apk
+++ /dev/null
Binary files differ
diff --git a/prebuilt/x86_SystemWebView.apk.xz.001 b/prebuilt/x86_SystemWebView.apk.xz.001
new file mode 100644
index 0000000..32e2dd7
--- /dev/null
+++ b/prebuilt/x86_SystemWebView.apk.xz.001
Binary files differ