From b901cd7bb0f4efdd60a0140fa29b65f81c7f053e Mon Sep 17 00:00:00 2001 From: harvey186 Date: Fri, 13 Sep 2024 09:38:52 +0200 Subject: [PATCH] generate.sh --- generate.sh | 28 ++++--------------- {tdgsi_a64_ab => leos_a64_ab}/BoardConfig.mk | 0 .../BoardConfig.mk | 0 tdgsi_a64_a/BoardConfig.mk | 8 ------ tdgsi_arm64_a/BoardConfig.mk | 7 ----- tdgsi_arm_a/BoardConfig.mk | 11 -------- tdgsi_arm_ab/BoardConfig.mk | 7 ----- 7 files changed, 5 insertions(+), 56 deletions(-) rename {tdgsi_a64_ab => leos_a64_ab}/BoardConfig.mk (100%) rename {tdgsi_arm64_ab => leos_arm64_ab}/BoardConfig.mk (100%) delete mode 100644 tdgsi_a64_a/BoardConfig.mk delete mode 100644 tdgsi_arm64_a/BoardConfig.mk delete mode 100644 tdgsi_arm_a/BoardConfig.mk delete mode 100644 tdgsi_arm_ab/BoardConfig.mk diff --git a/generate.sh b/generate.sh index 461eff1..6a43957 100644 --- a/generate.sh +++ b/generate.sh @@ -15,7 +15,7 @@ fi echo 'PRODUCT_MAKEFILES := \' > AndroidProducts.mk for part in a ab;do - for apps in vanilla gapps foss gapps-go;do + for apps in vanilla;do for arch in arm64 arm a64;do for su in yes no;do apps_suffix="" @@ -24,29 +24,11 @@ for part in a ab;do extra_packages="" vndk="vndk.mk" optional_base="" - if [ "$apps" == "gapps" ];then - apps_suffix="g" - apps_script='$(call inherit-product, device/phh/treble/gapps.mk)' - apps_name="with GApps" - fi - if [ "$apps" == "gapps-go" ];then - apps_suffix="o" - apps_script='$(call inherit-product, device/phh/treble/gapps-go.mk)' - apps_name="Go" - fi - if [ "$apps" == "foss" ];then - apps_suffix="f" - apps_script='$(call inherit-product, vendor/foss/foss.mk)' - apps_name="with FOSS apps" - fi if [ "$apps" == "vanilla" ];then apps_suffix="v" apps_script='' apps_name="vanilla" fi - if [ "$arch" == "arm" ];then - vndk="vndk-binder32.mk" - fi if [ "$arch" == "a64" ];then vndk="vndk32.mk" fi @@ -64,7 +46,7 @@ for part in a ab;do optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)' fi - target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}" + target="leos_${arch}_${part_suffix}${apps_suffix}${su_suffix}" baseArch="$arch" if [ "$arch" = "a64" ];then @@ -77,18 +59,18 @@ for part in a ab;do fi cat > ${target}.mk << EOF -TARGET_GAPPS_ARCH := ${baseArch} include build/make/target/product/aosp_${baseArch}.mk \$(call inherit-product, device/phh/treble/base.mk) +\$(call inherit-product, vendor/LeOS/leos.mk) $optional_base $apps_script $rom_script PRODUCT_NAME := $target -PRODUCT_DEVICE := tdgsi_${arch}_$part +PRODUCT_DEVICE := leos_${arch}_$part PRODUCT_BRAND := google PRODUCT_SYSTEM_BRAND := google -PRODUCT_MODEL := TrebleDroid $apps_name +PRODUCT_MODEL := LeOS-A15 # Overwrite the inherited "emulator" characteristics PRODUCT_CHARACTERISTICS := device diff --git a/tdgsi_a64_ab/BoardConfig.mk b/leos_a64_ab/BoardConfig.mk similarity index 100% rename from tdgsi_a64_ab/BoardConfig.mk rename to leos_a64_ab/BoardConfig.mk diff --git a/tdgsi_arm64_ab/BoardConfig.mk b/leos_arm64_ab/BoardConfig.mk similarity index 100% rename from tdgsi_arm64_ab/BoardConfig.mk rename to leos_arm64_ab/BoardConfig.mk diff --git a/tdgsi_a64_a/BoardConfig.mk b/tdgsi_a64_a/BoardConfig.mk deleted file mode 100644 index d430bf8..0000000 --- a/tdgsi_a64_a/BoardConfig.mk +++ /dev/null @@ -1,8 +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 -BOARD_SYSTEMIMAGE_AS_SYSTEM := true diff --git a/tdgsi_arm64_a/BoardConfig.mk b/tdgsi_arm64_a/BoardConfig.mk deleted file mode 100644 index c9bc831..0000000 --- a/tdgsi_arm64_a/BoardConfig.mk +++ /dev/null @@ -1,7 +0,0 @@ -include build/make/target/board/generic_arm64_ab/BoardConfig.mk -include device/phh/treble/board-base.mk - -ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2080374784 -endif -BOARD_SYSTEMIMAGE_AS_SYSTEM := true diff --git a/tdgsi_arm_a/BoardConfig.mk b/tdgsi_arm_a/BoardConfig.mk deleted file mode 100644 index 7340fc4..0000000 --- a/tdgsi_arm_a/BoardConfig.mk +++ /dev/null @@ -1,11 +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 := 1313583104 -else -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 25165824 -endif - -TARGET_USES_64_BIT_BINDER := false -BOARD_SYSTEMIMAGE_AS_SYSTEM := true diff --git a/tdgsi_arm_ab/BoardConfig.mk b/tdgsi_arm_ab/BoardConfig.mk deleted file mode 100644 index a9a4fe3..0000000 --- a/tdgsi_arm_ab/BoardConfig.mk +++ /dev/null @@ -1,7 +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 := 1073741824 -endif -TARGET_USES_64_BIT_BINDER := false -- 2.34.1