diff --git a/BromiteWebview/.version_code b/MulchWebview/.version_code similarity index 100% rename from BromiteWebview/.version_code rename to MulchWebview/.version_code diff --git a/BromiteWebview/Android.mk b/MulchWebview/Android.mk similarity index 57% rename from BromiteWebview/Android.mk rename to MulchWebview/Android.mk index 9d380de..83e5a13 100644 --- a/BromiteWebview/Android.mk +++ b/MulchWebview/Android.mk @@ -14,24 +14,34 @@ # limitations under the License. # -# Install the prebuilt 'Bromite' webview apk. -# see https://www.bromite.org/ +# Install the prebuilt webview apk. LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_OVERRIDES_PACKAGES := webview -LOCAL_MODULE := BromiteWebview +LOCAL_MODULE := MulchWebview LOCAL_MODULE_CLASS := APPS -LOCAL_CERTIFICATE := PRESIGNED +LOCAL_PRODUCT_MODULE := true +LOCAL_MULTILIB := both LOCAL_REQUIRED_MODULES := \ libwebviewchromium_loader \ libwebviewchromium_plat_support -LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 -LOCAL_SRC_FILES := BromiteWebview.apk +LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64 +my_src_arch := $(call get-prebuilt-src-arch,$(LOCAL_MODULE_TARGET_ARCH)) +LOCAL_SRC_FILES := prebuilt/$(my_src_arch)/MulchWebview.apk +# Don't sign our arm* builds for out-of-band distribution +ifneq ( ,$(filter $(my_src_arch), arm arm64)) +LOCAL_CERTIFICATE := PRESIGNED +else +LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) +endif + +LOCAL_PREBUILT_JNI_LIBS_arm := @lib/armeabi-v7a/libwebviewchromium.so LOCAL_PREBUILT_JNI_LIBS_arm64 := @lib/arm64-v8a/libwebviewchromium.so +LOCAL_PREBUILT_JNI_LIBS_x86 := @lib/x86/libwebviewchromium.so +LOCAL_PREBUILT_JNI_LIBS_x86_64 := @lib/x86_64/libwebviewchromium.so include $(BUILD_PREBUILT) diff --git a/BromiteWebview/CleanSpec.mk b/MulchWebview/CleanSpec.mk similarity index 94% rename from BromiteWebview/CleanSpec.mk rename to MulchWebview/CleanSpec.mk index 963e66c..6270203 100644 --- a/BromiteWebview/CleanSpec.mk +++ b/MulchWebview/CleanSpec.mk @@ -45,8 +45,7 @@ #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libwebviewchromium.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libwebviewchromium.so) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/bromite-webview) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/MulchWebview) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER diff --git a/BromiteWebview/BromiteWebview.apk b/MulchWebview/MulchWebview.apk similarity index 100% rename from BromiteWebview/BromiteWebview.apk rename to MulchWebview/MulchWebview.apk diff --git a/bromite.mk b/mulch.mk similarity index 61% rename from bromite.mk rename to mulch.mk index 7c6e996..207f914 100644 --- a/bromite.mk +++ b/mulch.mk @@ -1,5 +1,5 @@ include $(call first-makefiles-under,$(LOCAL_PATH)) PRODUCT_PACKAGES += \ - BromiteWebview \ - BromiteWebviewOverlay + MulchWebview \ + MulchWebviewOverlay diff --git a/product/overlay/BromiteWebviewOverlay/Android.mk b/product/overlay/MulchWebviewOverlay/Android.mk similarity index 75% rename from product/overlay/BromiteWebviewOverlay/Android.mk rename to product/overlay/MulchWebviewOverlay/Android.mk index 01504f1..dcf2cdd 100644 --- a/product/overlay/BromiteWebviewOverlay/Android.mk +++ b/product/overlay/MulchWebviewOverlay/Android.mk @@ -1,8 +1,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_PACKAGE_NAME := BromiteWebviewOverlay +LOCAL_PACKAGE_NAME := MulchWebviewOverlay LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true LOCAL_PRIVATE_PLATFORM_APIS := true -include $(BUILD_PACKAGE) \ No newline at end of file +include $(BUILD_PACKAGE) diff --git a/product/overlay/BromiteWebviewOverlay/AndroidManifest.xml b/product/overlay/MulchWebviewOverlay/AndroidManifest.xml similarity index 73% rename from product/overlay/BromiteWebviewOverlay/AndroidManifest.xml rename to product/overlay/MulchWebviewOverlay/AndroidManifest.xml index e5505cf..e2e8753 100644 --- a/product/overlay/BromiteWebviewOverlay/AndroidManifest.xml +++ b/product/overlay/MulchWebviewOverlay/AndroidManifest.xml @@ -1,10 +1,10 @@ - - \ No newline at end of file + + diff --git a/product/overlay/BromiteWebviewOverlay/res/xml/config_webview_packages.xml b/product/overlay/MulchWebviewOverlay/res/xml/config_webview_packages.xml similarity index 73% rename from product/overlay/BromiteWebviewOverlay/res/xml/config_webview_packages.xml rename to product/overlay/MulchWebviewOverlay/res/xml/config_webview_packages.xml index a87b0f8..0c98c73 100644 --- a/product/overlay/BromiteWebviewOverlay/res/xml/config_webview_packages.xml +++ b/product/overlay/MulchWebviewOverlay/res/xml/config_webview_packages.xml @@ -1,9 +1,10 @@ + + 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 diff --git a/updater/main.py b/updater/main.py index d00bc6c..f3249ff 100644 --- a/updater/main.py +++ b/updater/main.py @@ -37,10 +37,6 @@ def update_if_needed(module: str, release: ApkRelease): print('{} up to date.'.format(module)) fdroid_main_repo = 'https://www.f-droid.org/repo' -fdroid_microg_repo = 'https://microg.org/fdroid/repo' -fdroid_bromite_repo = 'https://fdroid.bromite.org/fdroid/repo' +fdroid_divestos_repo = 'https://divestos.org/fdroid/official' -update_if_needed('BromiteWebview', fdroid_recommended_release(fdroid_bromite_repo, 'org.bromite.webview')) - -#update_if_needed('FakeStore', fdroid_recommended_release(fdroid_microg_repo, 'com.android.vending')) -#update_if_needed('FDroid', fdroid_recommended_release(fdroid_main_repo, 'org.fdroid.fdroid')) +update_if_needed('MulchWebview', fdroid_recommended_release(fdroid_divestos_repo, 'us.spotco.mulch_wv'))