diff --git a/.github/workflows/build_twrp.yml b/.github/workflows/build_twrp.yml index c2bd903..617c96d 100644 --- a/.github/workflows/build_twrp.yml +++ b/.github/workflows/build_twrp.yml @@ -8,11 +8,11 @@ on: env: MANIFEST_URL: 'https://github.com/minimal-manifest-twrp/platform_manifest_twrp_omni' MANIFEST_BRANCH: 'twrp-9.0' - DEVICE_TREE_URL: 'https://github.com/mouseos/android_device_sts-tottori_a05bd' + DEVICE_TREE_URL: 'https://github.com/Maitani-Sakura/android_device_sts-tottori_a05ba' DEVICE_TREE_BRANCH: 'main' - DEVICE_PATH: 'device/sts/a05bd' - DEVICE_NAME: 'a05bd' - MAKEFILE_NAME: 'omni_a05bd' + DEVICE_PATH: 'device/sts/a05ba' + DEVICE_NAME: 'a05ba' + MAKEFILE_NAME: 'omni_a05ba' BUILD_TARGET: 'recovery' # COMMON_TREE_URLとCOMMON_PATHを必要に応じて指定してください diff --git a/Android.mk b/Android.mk index d50a9a0..ac0c1d1 100644 --- a/Android.mk +++ b/Android.mk @@ -7,6 +7,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),a05bd) +ifeq ($(TARGET_DEVICE),a05ba) include $(call all-subdir-makefiles,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c740745..c43c97a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -6,9 +6,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/omni_a05bd.mk + $(LOCAL_DIR)/omni_a05ba.mk COMMON_LUNCH_CHOICES := \ - omni_a05bd-user \ - omni_a05bd-userdebug \ - omni_a05bd-eng + omni_a05ba-user \ + omni_a05ba-userdebug \ + omni_a05ba-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 240fa8d..e1c8c86 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/sts/a05bd +DEVICE_PATH := device/sts/a05ba # For building with minimal manifest ALLOW_MISSING_DEPENDENCIES := true @@ -29,7 +29,7 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := generic OVERRIDE_TARGET_FLATTEN_APEX := true # Bootloader -TARGET_BOOTLOADER_BOARD_NAME := a05bd +TARGET_BOOTLOADER_BOARD_NAME := a05ba TARGET_NO_BOOTLOADER := true # Display @@ -47,8 +47,8 @@ BOARD_MKBOOTIMG_ARGS += --ramdisk_offset $(BOARD_RAMDISK_OFFSET) BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET) BOARD_KERNEL_IMAGE_NAME := Image BOARD_KERNEL_SEPARATED_DTBO := true -TARGET_KERNEL_CONFIG := a05bd_defconfig -TARGET_KERNEL_SOURCE := kernel/sts/a05bd +TARGET_KERNEL_CONFIG := a05ba_defconfig +TARGET_KERNEL_SOURCE := kernel/sts/a05ba # Kernel - prebuilt TARGET_FORCE_PREBUILT_KERNEL := true diff --git a/device.mk b/device.mk index 19b57f7..1e3ae56 100644 --- a/device.mk +++ b/device.mk @@ -5,4 +5,4 @@ # SPDX-License-Identifier: Apache-2.0 # -LOCAL_PATH := device/sts/a05bd +LOCAL_PATH := device/sts/a05ba diff --git a/omni_a05bd.mk b/omni_a05ba.mk similarity index 67% rename from omni_a05bd.mk rename to omni_a05ba.mk index 00e2982..5e8d5ae 100644 --- a/omni_a05bd.mk +++ b/omni_a05ba.mk @@ -13,17 +13,17 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, vendor/omni/config/common.mk) # Inherit from a05bd device -$(call inherit-product, device/sts/a05bd/device.mk) +$(call inherit-product, device/sts/a05ba/device.mk) -PRODUCT_DEVICE := a05bd -PRODUCT_NAME := omni_a05bd +PRODUCT_DEVICE := a05ba +PRODUCT_NAME := omni_a05ba PRODUCT_BRAND := benesse -PRODUCT_MODEL := a05bd +PRODUCT_MODEL := a05ba PRODUCT_MANUFACTURER := sts PRODUCT_GMS_CLIENTID_BASE := android-sts PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="TAB-A05-BD-user 9 01.00.000 01.00.000 release-keys" + PRIVATE_BUILD_DESC="TAB-A05-BA1-user 9 01.00.000 01.00.000 release-keys" -BUILD_FINGERPRINT := benesse/TAB-A05-BD/TAB-A05-BD:9/01.00.000/01.00.000:user/release-keys \ No newline at end of file +BUILD_FINGERPRINT := benesse/TAB-A05-BA1/TAB-A05-BD:9/01.00.000/01.00.000:user/release-keys \ No newline at end of file diff --git a/prebuilt/dtbo.img b/prebuilt/dtbo.img index a0d4c1f..753b62e 100644 Binary files a/prebuilt/dtbo.img and b/prebuilt/dtbo.img differ diff --git a/prebuilt/kernel b/prebuilt/kernel index f93b454..889b4ad 100644 Binary files a/prebuilt/kernel and b/prebuilt/kernel differ diff --git a/vendorsetup.sh b/vendorsetup.sh index 7e33793..6754c21 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -5,6 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -add_lunch_combo omni_a05bd-user -add_lunch_combo omni_a05bd-userdebug -add_lunch_combo omni_a05bd-eng +add_lunch_combo omni_a05ba-user +add_lunch_combo omni_a05ba-userdebug +add_lunch_combo omni_a05ba-eng