From fd8affbec34082da46ee7fd56d209e256fcf2bdd Mon Sep 17 00:00:00 2001 From: Usama Arif Date: Thu, 29 Apr 2021 12:14:58 +0100 Subject: [PATCH] Rename platform to tc With the introduction of tc1 platform, both tc0 and tc1 can use the same device profile, hence rename folders, files and variables to "tc". Signed-off-by: Usama Arif Change-Id: I1ab181aa8a09a226edec8e703f6eac977e67eb67 --- {tc0 => tc}/Android.mk | 2 +- {tc0 => tc}/AndroidProducts.mk | 8 ++++---- {tc0 => tc}/BoardConfig-partitions.mk | 2 +- {tc0 => tc}/BoardConfig_common.mk | 2 +- tc/allowed-vendorsetup_sh-files | 1 + {tc0 => tc}/device.mk | 0 {tc0 => tc}/fstab.total_compute | 0 {tc0 => tc}/fstab.total_compute_avb | 0 {tc0 => tc}/init.common.rc | 0 {tc0 => tc}/nano_art_minimal.mk | 0 {tc0 => tc}/nano_core.mk | 0 {tc0 => tc}/patches/0001-Add-include-of-fcntl.h.patch | 0 ...Update-allowed_deps.txt-to-avoid-build-errors.patch | 0 tc0/tc0_nano.mk => tc/tc_nano.mk | 6 +++--- {tc0/tc0_nano => tc/tc_nano}/BoardConfig.mk | 2 +- .../init.tc0_nano.rc => tc/tc_nano/init.tc_nano.rc | 0 tc0/tc0_swr.mk => tc/tc_swr.mk | 10 +++++----- {tc0/tc0_swr => tc/tc_swr}/BoardConfig.mk | 2 +- .../init.tc0_swr.rc => tc/tc_swr/init.tc_swr.rc | 0 {tc0/tc0_swr => tc/tc_swr}/manifest.xml | 0 .../frameworks/base/core/res/res/values/config.xml | 0 .../packages/SettingsProvider/res/values/defaults.xml | 0 {tc0 => tc}/ueventd.rc | 0 {tc0 => tc}/vendorsetup.sh | 2 +- tc0/allowed-vendorsetup_sh-files | 1 - 25 files changed, 19 insertions(+), 19 deletions(-) rename {tc0 => tc}/Android.mk (95%) rename {tc0 => tc}/AndroidProducts.mk (87%) rename {tc0 => tc}/BoardConfig-partitions.mk (98%) rename {tc0 => tc}/BoardConfig_common.mk (96%) create mode 100644 tc/allowed-vendorsetup_sh-files rename {tc0 => tc}/device.mk (100%) rename {tc0 => tc}/fstab.total_compute (100%) rename {tc0 => tc}/fstab.total_compute_avb (100%) rename {tc0 => tc}/init.common.rc (100%) rename {tc0 => tc}/nano_art_minimal.mk (100%) rename {tc0 => tc}/nano_core.mk (100%) rename {tc0 => tc}/patches/0001-Add-include-of-fcntl.h.patch (100%) rename {tc0 => tc}/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch (100%) rename tc0/tc0_nano.mk => tc/tc_nano.mk (89%) rename {tc0/tc0_nano => tc/tc_nano}/BoardConfig.mk (93%) rename tc0/tc0_nano/init.tc0_nano.rc => tc/tc_nano/init.tc_nano.rc (100%) rename tc0/tc0_swr.mk => tc/tc_swr.mk (95%) rename {tc0/tc0_swr => tc/tc_swr}/BoardConfig.mk (93%) rename tc0/tc0_swr/init.tc0_swr.rc => tc/tc_swr/init.tc_swr.rc (100%) rename {tc0/tc0_swr => tc/tc_swr}/manifest.xml (100%) rename {tc0/tc0_swr => tc/tc_swr}/overlay/frameworks/base/core/res/res/values/config.xml (100%) rename {tc0/tc0_swr => tc/tc_swr}/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml (100%) rename {tc0 => tc}/ueventd.rc (100%) rename {tc0 => tc}/vendorsetup.sh (95%) delete mode 100644 tc0/allowed-vendorsetup_sh-files diff --git a/tc0/Android.mk b/tc/Android.mk similarity index 95% rename from tc0/Android.mk rename to tc/Android.mk index 1c4cea6..7dd7797 100644 --- a/tc0/Android.mk +++ b/tc/Android.mk @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ifneq ($(filter tc0%, $(TARGET_DEVICE)),) +ifneq ($(filter tc%, $(TARGET_DEVICE)),) LOCAL_PATH := $(call my-dir) diff --git a/tc0/AndroidProducts.mk b/tc/AndroidProducts.mk similarity index 87% rename from tc0/AndroidProducts.mk rename to tc/AndroidProducts.mk index a5c67e9..6a2b274 100644 --- a/tc0/AndroidProducts.mk +++ b/tc/AndroidProducts.mk @@ -15,9 +15,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/tc0_nano.mk \ - $(LOCAL_DIR)/tc0_swr.mk + $(LOCAL_DIR)/tc_nano.mk \ + $(LOCAL_DIR)/tc_swr.mk COMMON_LUNCH_CHOICES := \ - tc0_nano-eng \ - tc0_swr-eng + tc_nano-eng \ + tc_swr-eng diff --git a/tc0/BoardConfig-partitions.mk b/tc/BoardConfig-partitions.mk similarity index 98% rename from tc0/BoardConfig-partitions.mk rename to tc/BoardConfig-partitions.mk index 368ceca..20da458 100644 --- a/tc0/BoardConfig-partitions.mk +++ b/tc/BoardConfig-partitions.mk @@ -47,7 +47,7 @@ TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := false TARGET_NO_RECOVERY := true -TARGET_PREBUILT_KERNEL := device/arm/tc0/Image +TARGET_PREBUILT_KERNEL := device/arm/tc/Image BOARD_MKBOOTIMG_ARGS := --base 0x0 --kernel_offset 0x80080000 --ramdisk_offset 0x88000000 BOARD_BOOTIMAGE_PARTITION_SIZE := 41943040 # 40 MB diff --git a/tc0/BoardConfig_common.mk b/tc/BoardConfig_common.mk similarity index 96% rename from tc0/BoardConfig_common.mk rename to tc/BoardConfig_common.mk index aa9e866..67c5d72 100644 --- a/tc0/BoardConfig_common.mk +++ b/tc/BoardConfig_common.mk @@ -32,7 +32,7 @@ TARGET_2ND_CPU_ABI2 := armeabi endif # Include configuration of partitions. -include device/arm/tc0/BoardConfig-partitions.mk +include device/arm/tc/BoardConfig-partitions.mk # Do not enable AVB for eng builds, only for userdebug and user builds ifneq ($(TARGET_BUILD_VARIANT),eng) diff --git a/tc/allowed-vendorsetup_sh-files b/tc/allowed-vendorsetup_sh-files new file mode 100644 index 0000000..db86df5 --- /dev/null +++ b/tc/allowed-vendorsetup_sh-files @@ -0,0 +1 @@ +device/arm/tc/vendorsetup.sh \ No newline at end of file diff --git a/tc0/device.mk b/tc/device.mk similarity index 100% rename from tc0/device.mk rename to tc/device.mk diff --git a/tc0/fstab.total_compute b/tc/fstab.total_compute similarity index 100% rename from tc0/fstab.total_compute rename to tc/fstab.total_compute diff --git a/tc0/fstab.total_compute_avb b/tc/fstab.total_compute_avb similarity index 100% rename from tc0/fstab.total_compute_avb rename to tc/fstab.total_compute_avb diff --git a/tc0/init.common.rc b/tc/init.common.rc similarity index 100% rename from tc0/init.common.rc rename to tc/init.common.rc diff --git a/tc0/nano_art_minimal.mk b/tc/nano_art_minimal.mk similarity index 100% rename from tc0/nano_art_minimal.mk rename to tc/nano_art_minimal.mk diff --git a/tc0/nano_core.mk b/tc/nano_core.mk similarity index 100% rename from tc0/nano_core.mk rename to tc/nano_core.mk diff --git a/tc0/patches/0001-Add-include-of-fcntl.h.patch b/tc/patches/0001-Add-include-of-fcntl.h.patch similarity index 100% rename from tc0/patches/0001-Add-include-of-fcntl.h.patch rename to tc/patches/0001-Add-include-of-fcntl.h.patch diff --git a/tc0/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch b/tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch similarity index 100% rename from tc0/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch rename to tc/patches/0001-Update-allowed_deps.txt-to-avoid-build-errors.patch diff --git a/tc0/tc0_nano.mk b/tc/tc_nano.mk similarity index 89% rename from tc0/tc0_nano.mk rename to tc/tc_nano.mk index 91a2586..fe1ded7 100644 --- a/tc0/tc0_nano.mk +++ b/tc/tc_nano.mk @@ -19,9 +19,9 @@ $(call inherit-product, $(LOCAL_PATH)/nano_core.mk) $(call inherit-product, $(LOCAL_PATH)/nano_art_minimal.mk) $(call inherit-product, $(LOCAL_PATH)/device.mk) -PRODUCT_NAME := tc0_nano +PRODUCT_NAME := tc_nano PRODUCT_MANUFACTURER := Arm -PRODUCT_DEVICE := tc0_nano +PRODUCT_DEVICE := tc_nano PRODUCT_MODEL := Total Compute Fast Model (Nano build) OVERRIDE_TARGET_FLATTEN_APEX := true @@ -29,4 +29,4 @@ OVERRIDE_TARGET_FLATTEN_APEX := true MULTILIB_BUILD := true PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/tc0_nano/init.tc0_nano.rc:root/init.total_compute.rc \ No newline at end of file + $(LOCAL_PATH)/tc_nano/init.tc_nano.rc:root/init.total_compute.rc \ No newline at end of file diff --git a/tc0/tc0_nano/BoardConfig.mk b/tc/tc_nano/BoardConfig.mk similarity index 93% rename from tc0/tc0_nano/BoardConfig.mk rename to tc/tc_nano/BoardConfig.mk index 1c5ffce..824ab40 100644 --- a/tc0/tc0_nano/BoardConfig.mk +++ b/tc/tc_nano/BoardConfig.mk @@ -14,4 +14,4 @@ # limitations under the License. # -include device/arm/tc0/BoardConfig_common.mk +include device/arm/tc/BoardConfig_common.mk diff --git a/tc0/tc0_nano/init.tc0_nano.rc b/tc/tc_nano/init.tc_nano.rc similarity index 100% rename from tc0/tc0_nano/init.tc0_nano.rc rename to tc/tc_nano/init.tc_nano.rc diff --git a/tc0/tc0_swr.mk b/tc/tc_swr.mk similarity index 95% rename from tc0/tc0_swr.mk rename to tc/tc_swr.mk index f5e7849..5a4dce6 100644 --- a/tc0/tc0_swr.mk +++ b/tc/tc_swr.mk @@ -18,12 +18,12 @@ $(call inherit-product, $(LOCAL_PATH)/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) -PRODUCT_NAME := tc0_swr +PRODUCT_NAME := tc_swr PRODUCT_MANUFACTURER := Arm -PRODUCT_DEVICE := tc0_swr +PRODUCT_DEVICE := tc_swr PRODUCT_MODEL := Total Compute Fast Model (S/W rendering build) -DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/tc0_swr/manifest.xml +DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/tc_swr/manifest.xml PRODUCT_PACKAGES += \ android.hardware.audio@5.0-impl \ @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ # Required to override some device configuration, most importantly the # radio/network settings. -DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/tc0_swr/overlay +DEVICE_PACKAGE_OVERLAYS := $(LOCAL_PATH)/tc_swr/overlay PRODUCT_PROPERTY_OVERRIDES += \ ro.sf.lcd_density=90 \ @@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/tc0_swr/init.tc0_swr.rc:root/init.total_compute.rc + $(LOCAL_PATH)/tc_swr/init.tc_swr.rc:root/init.total_compute.rc PRODUCT_PACKAGES += \ libEGL_swiftshader \ diff --git a/tc0/tc0_swr/BoardConfig.mk b/tc/tc_swr/BoardConfig.mk similarity index 93% rename from tc0/tc0_swr/BoardConfig.mk rename to tc/tc_swr/BoardConfig.mk index b5e070d..a45ba25 100644 --- a/tc0/tc0_swr/BoardConfig.mk +++ b/tc/tc_swr/BoardConfig.mk @@ -14,5 +14,5 @@ # limitations under the License. # -include device/arm/tc0/BoardConfig_common.mk +include device/arm/tc/BoardConfig_common.mk diff --git a/tc0/tc0_swr/init.tc0_swr.rc b/tc/tc_swr/init.tc_swr.rc similarity index 100% rename from tc0/tc0_swr/init.tc0_swr.rc rename to tc/tc_swr/init.tc_swr.rc diff --git a/tc0/tc0_swr/manifest.xml b/tc/tc_swr/manifest.xml similarity index 100% rename from tc0/tc0_swr/manifest.xml rename to tc/tc_swr/manifest.xml diff --git a/tc0/tc0_swr/overlay/frameworks/base/core/res/res/values/config.xml b/tc/tc_swr/overlay/frameworks/base/core/res/res/values/config.xml similarity index 100% rename from tc0/tc0_swr/overlay/frameworks/base/core/res/res/values/config.xml rename to tc/tc_swr/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/tc0/tc0_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/tc/tc_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml similarity index 100% rename from tc0/tc0_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml rename to tc/tc_swr/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml diff --git a/tc0/ueventd.rc b/tc/ueventd.rc similarity index 100% rename from tc0/ueventd.rc rename to tc/ueventd.rc diff --git a/tc0/vendorsetup.sh b/tc/vendorsetup.sh similarity index 95% rename from tc0/vendorsetup.sh rename to tc/vendorsetup.sh index 1307a36..7fcaf99 100644 --- a/tc0/vendorsetup.sh +++ b/tc/vendorsetup.sh @@ -31,7 +31,7 @@ function apply_patch { } ANDROID_TOP_DIR=$(pwd) -PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc0/patches +PATCHES_DIR=$ANDROID_TOP_DIR/device/arm/tc/patches apply_patch "external/drm_hwcomposer" "0001-Add-include-of-fcntl.h.patch" apply_patch "packages/modules/common" "0001-Update-allowed_deps.txt-to-avoid-build-errors.patch" diff --git a/tc0/allowed-vendorsetup_sh-files b/tc0/allowed-vendorsetup_sh-files deleted file mode 100644 index 0e8629e..0000000 --- a/tc0/allowed-vendorsetup_sh-files +++ /dev/null @@ -1 +0,0 @@ -device/arm/tc0/vendorsetup.sh \ No newline at end of file -- GitLab