Rename aosp_beryllium build target to beryllium
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/Android.mk b/Android.mk
index c32d297..dcd9bc5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@
# to only building on ARM if they include assembly. Individual makefiles
# are responsible for having their own logic, for fine-grained control.
-ifneq ($(filter aosp_beryllium, $(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter beryllium, $(TARGET_BOARD_PLATFORM)),)
LOCAL_PATH := $(call my-dir)
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index db93ad0..486b002 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -10,7 +10,7 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/aosp_beryllium.mk
+ $(LOCAL_DIR)/beryllium.mk
COMMON_LUNCH_CHOICES := \
- aosp_beryllium-userdebug
+ beryllium-userdebug
diff --git a/README.md b/README.md
index 4870c43..9168f50 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
TWRP and copy them to your Host machine. It will come
very handy. Believe me :)
-# How to build and flash aosp_beryllium images?
+# How to build and flash beryllium AOSP images?
* Download source and build AOSP images for Poco F1 (Beryllium) -->
@@ -37,7 +37,7 @@
git clone git@github.com:pundiramit/android-local-manifests.git .repo/local_manifests -b master
repo sync -j$nproc
source build/envsetup.sh
-lunch aosp_beryllium-userdebug
+lunch beryllium-userdebug
make -j$nproc
```
@@ -51,7 +51,7 @@
lineage-16.0-20190612-nightly-beryllium-signed.zip ;)
Then copy the binaries to out vendor directory
- i.e. out/target/product/aosp_beryllium/vendor/firmware,
+ i.e. out/target/product/beryllium/vendor/firmware,
and run "make -j$nproc" to create vendor.img again.
* Flash and boot AOSP images -->
@@ -103,7 +103,7 @@
```
cd aosp-repo
source build/envsetup.sh
-lunch aosp_beryllium-userdebug
+lunch beryllium-userdebug
make TARGET_KERNEL_USE=mainline -j$nproc
```
diff --git a/aosp_beryllium.mk b/beryllium.mk
similarity index 84%
rename from aosp_beryllium.mk
rename to beryllium.mk
index a7b4330..8fd654d 100644
--- a/aosp_beryllium.mk
+++ b/beryllium.mk
@@ -14,11 +14,11 @@
# Inherit the full_base and device configurations
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/xiaomi/beryllium/aosp_beryllium/device.mk)
+$(call inherit-product, device/xiaomi/beryllium/beryllium/device.mk)
$(call inherit-product, device/xiaomi/beryllium/device-common.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
# Product overrides
-PRODUCT_NAME := aosp_beryllium
-PRODUCT_DEVICE := aosp_beryllium
+PRODUCT_NAME := beryllium
+PRODUCT_DEVICE := beryllium
PRODUCT_BRAND := AOSP
diff --git a/aosp_beryllium/BoardConfig.mk b/beryllium/BoardConfig.mk
similarity index 81%
rename from aosp_beryllium/BoardConfig.mk
rename to beryllium/BoardConfig.mk
index 475b603..b43d2bf 100644
--- a/aosp_beryllium/BoardConfig.mk
+++ b/beryllium/BoardConfig.mk
@@ -2,8 +2,8 @@
# Copied from https://github.com/LineageOS/android_device_xiaomi_sdm845-common/blob/lineage-16.0/BoardConfigCommon.mk
# Board Information
-TARGET_BOOTLOADER_BOARD_NAME := aosp_beryllium
-TARGET_BOARD_PLATFORM := aosp_beryllium
+TARGET_BOOTLOADER_BOARD_NAME := beryllium
+TARGET_BOARD_PLATFORM := beryllium
# Kernel/boot.img Configuration
BOARD_KERNEL_BASE := 0x00000000
@@ -11,7 +11,7 @@
BOARD_KERNEL_TAGS_OFFSET := 0x00000100
BOARD_RAMDISK_OFFSET := 0x01000000
BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 androidboot.console=ttyMSM0
-BOARD_KERNEL_CMDLINE += androidboot.hardware=aosp_beryllium androidboot.boot_devices=soc@0/1d84000.ufshc
+BOARD_KERNEL_CMDLINE += androidboot.hardware=beryllium androidboot.boot_devices=soc@0/1d84000.ufshc
BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30
BOARD_KERNEL_CMDLINE += fw_devlink=permissive
diff --git a/aosp_beryllium/device.mk b/beryllium/device.mk
similarity index 86%
rename from aosp_beryllium/device.mk
rename to beryllium/device.mk
index e8ca0cb..f4ab124 100644
--- a/aosp_beryllium/device.mk
+++ b/beryllium/device.mk
@@ -23,14 +23,14 @@
PRODUCT_COPY_FILES := \
- $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.aosp_beryllium \
- $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.aosp_beryllium \
- device/xiaomi/beryllium/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aosp_beryllium.rc \
- device/xiaomi/beryllium/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aosp_beryllium.usb.rc \
- device/xiaomi/beryllium/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/aosp_beryllium.kl
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.beryllium \
+ $(LOCAL_PATH)/fstab.ramdisk:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beryllium \
+ device/xiaomi/beryllium/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.rc \
+ device/xiaomi/beryllium/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.beryllium.usb.rc \
+ device/xiaomi/beryllium/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/beryllium.kl
# Build generic Audio HAL
-PRODUCT_PACKAGES := audio.primary.aosp_beryllium
+PRODUCT_PACKAGES := audio.primary.beryllium
PRODUCT_PACKAGES += \
pd-mapper \
diff --git a/aosp_beryllium/fstab.ramdisk b/beryllium/fstab.ramdisk
similarity index 100%
rename from aosp_beryllium/fstab.ramdisk
rename to beryllium/fstab.ramdisk
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 9f1b137..1f2a338 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter aosp_beryllium, $(TARGET_DEVICE)),)
+ifneq ($(filter beryllium, $(TARGET_DEVICE)),)
IMAGE_GZ := device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/Image.gz
DTB := device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/sdm845-beryllium.dtb