aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Karasangabo <olivier@lineageos.org>2020-04-30 14:08:54 +0200
committerOlivier Karasangabo <olivier@lineageos.org>2020-07-24 01:29:10 +0200
commit8784a9d81524101e4f333a456c9966b33258712f (patch)
tree96c722eeb9d0b7b33a49e7ee48bb3708bc2fc1fe
parent376b97d2e2a954b76518f238ec57cc30fa61670f (diff)
xz2c: Initial commit
* Rename tree as a Lineage apollo tree already exists. Change-Id: I05fd1a021911159132291652406870f6cf4b3e1c
-rw-r--r--Android.mk2
-rw-r--r--AndroidProducts.mk8
-rw-r--r--BoardConfig.mk6
-rw-r--r--device.mk2
-rwxr-xr-xextract-files.sh2
-rw-r--r--lineage_xz2c.mk (renamed from lineage_apollo.mk)8
-rwxr-xr-xsetup-makefiles.sh2
7 files changed, 15 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk
index 4124272..9893cfe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),apollo)
+ifeq ($(TARGET_DEVICE),xz2c)
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ade242b..671446a 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,9 +14,9 @@
# limitations under the License.
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_apollo.mk
+ $(LOCAL_DIR)/lineage_xz2c.mk
COMMON_LUNCH_CHOICES := \
- lineage_apollo-user \
- lineage_apollo-userdebug \
- lineage_apollo-eng
+ lineage_xz2c-user \
+ lineage_xz2c-userdebug \
+ lineage_xz2c-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 32cf870..a420519 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,10 +7,10 @@
# Inherit from tama-common
-include device/sony/tama-common/BoardConfigCommon.mk
-DEVICE_PATH := device/sony/apollo
+DEVICE_PATH := device/sony/xz2c
# Assert
-TARGET_OTA_ASSERT_DEVICE := H8314,H8324,apollo,apollo_dual
+TARGET_OTA_ASSERT_DEVICE := H8314,H8324,apollo,apollo_dual,xz2c,xz2c_dual
# Crypto
TARGET_HW_DISK_ENCRYPTION := true
@@ -35,4 +35,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
BOARD_VNDK_RUNTIME_DISABLE := true
# Inherit from the proprietary version
--include vendor/sony/apollo/BoardConfigVendor.mk
+-include vendor/sony/xz2c/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 59e6760..29f9987 100644
--- a/device.mk
+++ b/device.mk
@@ -7,7 +7,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk)
# Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/sony/apollo/apollo-vendor.mk)
+$(call inherit-product-if-exists, vendor/sony/xz2c/xz2c-vendor.mk)
# Boot animation
TARGET_SCREEN_HEIGHT := 2160
diff --git a/extract-files.sh b/extract-files.sh
index f33a397..b7a640a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,7 +14,7 @@ fi
set -e
# Required!
-export DEVICE=apollo
+export DEVICE=xz2c
export DEVICE_COMMON=tama-common
export VENDOR=sony
diff --git a/lineage_apollo.mk b/lineage_xz2c.mk
index cefa8b4..7a5e824 100644
--- a/lineage_apollo.mk
+++ b/lineage_xz2c.mk
@@ -4,14 +4,14 @@
# SPDX-License-Identifier: Apache-2.0
#
-# Inherit from apollo device
-$(call inherit-product, device/sony/apollo/device.mk)
+# Inherit from xz2c device
+$(call inherit-product, device/sony/xz2c/device.mk)
# Inherit some common Lineage stuff.
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-PRODUCT_NAME := lineage_apollo
-PRODUCT_DEVICE := apollo
+PRODUCT_NAME := lineage_xz2c
+PRODUCT_DEVICE := xz2c
PRODUCT_MANUFACTURER := Sony
PRODUCT_BRAND := Sony
PRODUCT_MODEL := Xperia XZ2 Compact
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 58694b5..bfd84a7 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,7 +8,7 @@
set -e
# Required!
-export DEVICE=apollo
+export DEVICE=xz2c
export DEVICE_COMMON=tama-common
export VENDOR=sony