diff --git a/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk b/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk new file mode 100644 index 00000000..5afdcd72 --- /dev/null +++ b/Patches/LineageOS-14.1/Fennec_DOS-Shim/Android.mk @@ -0,0 +1,33 @@ +# +# Copyright (C) 2014 The Android Open Source 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. +# + +# Install a shim for Fennec DOS +# Once a user runs F-Droid for the first time, it'll update and install the real Fennec DOS + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := FennecDOS +LOCAL_MODULE_CLASS := APPS +LOCAL_MULTILIB := both +LOCAL_CERTIFICATE := PRESIGNED + +LOCAL_OVERRIDES_PACKAGES := Jelly +LOCAL_DEX_PREOPT := false +LOCAL_SRC_FILES := prebuilt/Fennec_DOS-Shim.apk + +include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk b/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk new file mode 100644 index 00000000..f86c7525 Binary files /dev/null and b/Patches/LineageOS-14.1/Fennec_DOS-Shim/prebuilt/Fennec_DOS-Shim.apk differ diff --git a/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk b/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk index c3ebd2d6..41bb6ea5 100644 --- a/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk +++ b/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk @@ -11,7 +11,7 @@ LOCAL_PACKAGE_NAME := DejaVu dejavu_root := $(LOCAL_PATH) dejavu_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates dejavu_build := $(dejavu_root)/build -dejavu_apk := build/outputs/apk/app-release-unsigned.apk +dejavu_apk := app/build/outputs/apk/release/app-release-unsigned.apk $(dejavu_root)/$(dejavu_apk): rm -Rf $(dejavu_build) diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk index 41348e51..bf0a4122 100644 --- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk +++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk @@ -14,3 +14,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ F-Droid \ FDroidPrivilegedExtension + +# Browser +PRODUCT_PACKAGES += \ + FennecDOS diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 241a6469..db644629 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -60,6 +60,10 @@ enter() { # #START OF ROM CHANGES # + +#top dir +cp -r $patches"Fennec_DOS-Shim" packages/apps/.; #Add a shim to install Fennec DOS without actually including the large APK + enter "build" patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence