diff --git a/cat/AndroidProducts.mk b/cat/AndroidProducts.mk deleted file mode 100644 index 71ecae1..0000000 --- a/cat/AndroidProducts.mk +++ /dev/null @@ -1,2 +0,0 @@ -PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/cat_s22.mk diff --git a/cat/cat_s22.mk b/cat/cat_s22.mk deleted file mode 100644 index ef50b45..0000000 --- a/cat/cat_s22.mk +++ /dev/null @@ -1,64 +0,0 @@ -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) - -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - - -# Enable mainline checking -# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) - -# -# Special settings for GSI releasing -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) - - -# Don't build super.img -PRODUCT_BUILD_SUPER_PARTITION := false - -PRODUCT_NAME := cat_s22 -PRODUCT_DEVICE := cat_s22 -PRODUCT_BRAND := Android -PRODUCT_MODEL := wePhone Cat S22 - -PRODUCT_CHARACTERISTICS := device - -PRODUCT_PACKAGE_OVERLAYS += device/wephone/cat/overlay - -PRODUCT_COPY_FILES += \ - device/wephone/cat/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \ - device/wephone/cat/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \ - device/wephone/cat/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm \ - device/wephone/cat/files/wephone.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/wephone.rc \ - device/wephone/cat/files/wephone-boot.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/wephone-boot.sh - -PRODUCT_PACKAGES += \ - BromiteSystemWebView \ - Conversations \ - Davx5 \ - Etar \ - ExactCalculator \ - DeskClock \ - FairEmail \ - FDroid \ - K9Mail \ - Linphone \ - Nextcloud \ - NextcloudNotes \ - OpenDocumentReader \ - Wireguard - -PRODUCT_PACKAGES -= \ - EasterEgg \ - webview \ - libwebviewchromium_loader \ - libwebviewchromium_plat_support diff --git a/cat/cat_s22/BoardConfig.mk b/cat/cat_s22/BoardConfig.mk deleted file mode 100644 index 50f2c2e..0000000 --- a/cat/cat_s22/BoardConfig.mk +++ /dev/null @@ -1,9 +0,0 @@ -include build/make/target/board/generic_arm_ab/BoardConfig.mk -#include device/phh/treble/board-base.mk - -ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000 -endif - -TARGET_USES_64_BIT_BINDER := true -TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP) diff --git a/cat/files/wephone-boot.sh b/cat/files/wephone-boot.sh deleted file mode 100755 index acc57cf..0000000 --- a/cat/files/wephone-boot.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/system/bin/sh - -touch /mnt/wephone_script -mount -o bind /vendor/etc/audio/audio_policy_configuration.xml /vendor/etc/audio_policy_configuration.xml \ No newline at end of file diff --git a/cat/files/wephone.rc b/cat/files/wephone.rc deleted file mode 100644 index a4934de..0000000 --- a/cat/files/wephone.rc +++ /dev/null @@ -1,6 +0,0 @@ -service wephone_boot /system/bin/wephone-boot.sh - oneshot - disabled - -on property:sys.boot_completed=1 - start wephone_boot \ No newline at end of file diff --git a/cat/system.prop b/cat/system.prop deleted file mode 100644 index a17245b..0000000 --- a/cat/system.prop +++ /dev/null @@ -1,2 +0,0 @@ -# Fixed Bluetooth audio -persist.bluetooth.bluetooth_audio_hal.disabled=true diff --git a/cats22flip/AndroidProducts.mk b/cats22flip/AndroidProducts.mk new file mode 100644 index 0000000..acf82ea --- /dev/null +++ b/cats22flip/AndroidProducts.mk @@ -0,0 +1,2 @@ +PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/cats22flip.mk diff --git a/cats22flip/board-base.mk b/cats22flip/board-base.mk new file mode 100644 index 0000000..1321772 --- /dev/null +++ b/cats22flip/board-base.mk @@ -0,0 +1 @@ +TARGET_SYSTEM_PROP := device/wephone/qinf21pro/system.prop $(TARGET_SYSTEM_PROP) diff --git a/cats22flip/cat/BoardConfig.mk b/cats22flip/cat/BoardConfig.mk new file mode 100644 index 0000000..bebe941 --- /dev/null +++ b/cats22flip/cat/BoardConfig.mk @@ -0,0 +1,8 @@ +include build/make/target/board/generic/BoardConfig.mk +include device/wephone/cats22flip/board-base.mk + +ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000 +endif + +TARGET_USES_64_BIT_BINDER := true diff --git a/cats22flip/cats22flip.mk b/cats22flip/cats22flip.mk new file mode 100644 index 0000000..d2c94cd --- /dev/null +++ b/cats22flip/cats22flip.mk @@ -0,0 +1,41 @@ +TARGET_GAPPS_ARCH := arm + +include build/make/target/product/aosp_arm.mk + +PRODUCT_NAME := cats22flip +PRODUCT_DEVICE := cat +PRODUCT_BRAND := wephone +PRODUCT_MODEL := weOs | v13.0.1 | Nehemiah + +# This is for a device +PRODUCT_CHARACTERISTICS := device + +PRODUCT_PACKAGE_OVERLAYS += device/wephone/cats22flip/overlay + +PRODUCT_COPY_FILES += \ + device/wephone/cats22flip/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \ + device/wephone/cats22flip/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \ + device/wephone/cats22flip/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm + +PRODUCT_PACKAGES += \ + BromiteSystemWebView \ + Conversations \ + Davx5 \ + DeskClock \ + Etar \ + ExactCalculator \ + Gallery2 \ + K-9Mail \ + Linphone \ + Nextcloud \ + NextcloudNotes \ + OpenDocumentReader \ + Wireguard + +PRODUCT_PACKAGES -= \ + EasterEgg \ + webview \ + libwebviewchromium_loader \ + libwebviewchromium_plat_support \ + CtsShimPrebuilt \ + CtsShimPrivPrebuilt diff --git a/cat/files/qpnp_pon.kl b/cats22flip/files/qpnp_pon.kl similarity index 100% rename from cat/files/qpnp_pon.kl rename to cats22flip/files/qpnp_pon.kl diff --git a/cat/files/soc_matrix_keypad.kcm b/cats22flip/files/soc_matrix_keypad.kcm similarity index 100% rename from cat/files/soc_matrix_keypad.kcm rename to cats22flip/files/soc_matrix_keypad.kcm diff --git a/cat/files/soc_matrix_keypad.kl b/cats22flip/files/soc_matrix_keypad.kl similarity index 100% rename from cat/files/soc_matrix_keypad.kl rename to cats22flip/files/soc_matrix_keypad.kl diff --git a/cat/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/cats22flip/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png similarity index 100% rename from cat/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png rename to cats22flip/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png diff --git a/cat/overlay/frameworks/base/core/res/res/values/config.xml b/cats22flip/overlay/frameworks/base/core/res/res/values/config.xml similarity index 100% rename from cat/overlay/frameworks/base/core/res/res/values/config.xml rename to cats22flip/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/cat/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml b/cats22flip/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml similarity index 100% rename from cat/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml rename to cats22flip/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml diff --git a/cat/patches/button_backlights.patch b/cats22flip/patches/button_backlights.patch similarity index 100% rename from cat/patches/button_backlights.patch rename to cats22flip/patches/button_backlights.patch diff --git a/cats22flip/system.prop b/cats22flip/system.prop new file mode 100644 index 0000000..e69de29