xz2c -> apollo

Change-Id: I050916dbc4dc68f97fd7de3cac2ae95e3378e992

7 files changed, 14 insertions, 14 deletions

diff --git a/Android.mk b/Android.mk
index 9893cfe..4124272 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),xz2c)
+ifeq ($(TARGET_DEVICE),apollo)
   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 671446a..ade242b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_xz2c.mk
+    $(LOCAL_DIR)/lineage_apollo.mk
 
 COMMON_LUNCH_CHOICES := \
-    lineage_xz2c-user \
-    lineage_xz2c-userdebug \
-    lineage_xz2c-eng
+    lineage_apollo-user \
+    lineage_apollo-userdebug \
+    lineage_apollo-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index a420519..e773fa8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,7 +7,7 @@
 # Inherit from tama-common
 -include device/sony/tama-common/BoardConfigCommon.mk
 
-DEVICE_PATH := device/sony/xz2c
+DEVICE_PATH := device/sony/apollo
 
 # Assert
 TARGET_OTA_ASSERT_DEVICE := H8314,H8324,apollo,apollo_dual,xz2c,xz2c_dual
@@ -35,4 +35,4 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 BOARD_VNDK_RUNTIME_DISABLE := true
 
 # Inherit from the proprietary version
--include vendor/sony/xz2c/BoardConfigVendor.mk
+-include vendor/sony/apollo/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 4e2fe10..ca6d598 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/xz2c/xz2c-vendor.mk)
+$(call inherit-product-if-exists, vendor/sony/apollo/apollo-vendor.mk)
 
 # Boot animation
 TARGET_SCREEN_HEIGHT := 2160
diff --git a/extract-files.sh b/extract-files.sh
index b7a640a..f33a397 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,7 +14,7 @@ fi
 set -e
 
 # Required!
-export DEVICE=xz2c
+export DEVICE=apollo
 export DEVICE_COMMON=tama-common
 export VENDOR=sony
 
diff --git a/lineage_xz2c.mk b/lineage_apollo.mk
index 5fbebbe..41fa411 100644
--- a/lineage_xz2c.mk
+++ b/lineage_apollo.mk
@@ -4,14 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit from xz2c device
-$(call inherit-product, device/sony/xz2c/device.mk)
+# Inherit from apollo device
+$(call inherit-product, device/sony/apollo/device.mk)
 
 # Inherit some common Lineage stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_xz2c
-PRODUCT_DEVICE := xz2c
+PRODUCT_NAME := lineage_apollo
+PRODUCT_DEVICE := apollo
 PRODUCT_MANUFACTURER := Sony
 PRODUCT_BRAND := Sony
 PRODUCT_MODEL := Xperia XZ2 Compact
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index bfd84a7..58694b5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,7 +8,7 @@
 set -e
 
 # Required!
-export DEVICE=xz2c
+export DEVICE=apollo
 export DEVICE_COMMON=tama-common
 export VENDOR=sony