Welcome to Repulic Of Gamers II

Change-Id: I7b4ba30e1409829267136c0dbc0c930be60bc588
diff --git a/Android.mk b/Android.mk
index 38e69fa..2963c72 100755
--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone6))
+ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),rog2))
 
 endif
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index b5f3a09..7e67478 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -16,6 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter zenfone6,$(TARGET_DEVICE)),)
+ifneq ($(filter rog2,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index fda8653..470c640 100755
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,8 +1,8 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/device.mk \
-    $(LOCAL_DIR)/omni_zenfone6.mk
+    $(LOCAL_DIR)/omni_rog2.mk
 
 COMMON_LUNCH_CHOICES := \
-    omni_zenfone6-user \
-    omni_zenfone6-userdebug \
-    omni_zenfone6-eng
\ No newline at end of file
+    omni_rog2-user \
+    omni_rog2-userdebug \
+    omni_rog2-eng
\ No newline at end of file
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f6e68d6..5b1afa9 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,7 +18,7 @@
 # device-specific aspects (drivers) with a device-agnostic
 # product configuration (apps).
 #
-DEVICE_PATH := device/asus/zenfone6
+DEVICE_PATH := device/asus/rog2
 
 BOARD_VENDOR := asus
 
@@ -115,7 +115,7 @@
 BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
 TARGET_COMPILE_WITH_MSM_KERNEL := true
 TARGET_KERNEL_SOURCE := kernel/asus/sm8150
-TARGET_KERNEL_CONFIG := vendor/zs630kl_defconfig
+TARGET_KERNEL_CONFIG := vendor/rog2_defconfig
 BOARD_KERNEL_SEPARATED_DTBO := true
 TARGET_KERNEL_CLANG_COMPILE := true
 
diff --git a/DeviceParts/Android.mk b/DeviceParts/Android.mk
index b933a40..9d01b53 100644
--- a/DeviceParts/Android.mk
+++ b/DeviceParts/Android.mk
@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),zenfone6))
+ifeq ($(TARGET_DEVICE),$(filter $(TARGET_DEVICE),rog2))
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index d165ec1..193ac05 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -21,7 +21,7 @@
 
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME   "ZenFone 6"
+#define BTM_DEF_LOCAL_NAME   "ROG Phone 2"
 // Disables read remote device feature
 #define MAX_ACL_CONNECTIONS   16
 #define MAX_L2CAP_CHANNELS    16
@@ -30,4 +30,4 @@
 #define BT_CLEAN_TURN_ON_DISABLED 1
 /* Increasing SEPs to 12 from 6 to support SHO/MCast i.e. two streams per codec */
 #define AVDT_NUM_SEPS 12
-#endif
\ No newline at end of file
+#endif
diff --git a/device.mk b/device.mk
index f11b866..99c9e39 100755
--- a/device.mk
+++ b/device.mk
@@ -19,7 +19,7 @@
 # device-specific aspects (drivers) with a device-agnostic
 # product configuration (apps).
 #
-$(call inherit-product, vendor/asus/zenfone6/zenfone6-vendor.mk)
+$(call inherit-product, vendor/asus/rog2/rog2-vendor.mk)
 $(call inherit-product-if-exists, vendor/gapps/arm64/arm64-vendor.mk)
 
 # Enable updating of APEXes
@@ -129,8 +129,8 @@
 
 # Prebuilt
 PRODUCT_COPY_FILES += \
-    $(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/system,system) \
-    $(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/root,root)
+    $(call find-copy-subdir-files,*,device/asus/rog2/prebuilt/system,system) \
+    $(call find-copy-subdir-files,*,device/asus/rog2/prebuilt/root,root)
 
 PRODUCT_AAPT_CONFIG := normal
 PRODUCT_AAPT_PREF_CONFIG := xxhdpi
diff --git a/extract-files.sh b/extract-files.sh
index ed29f36..642f25e 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -18,7 +18,7 @@
 
 set -e
 
-DEVICE=zenfone6
+DEVICE=rog2
 VENDOR=asus
 
 # Load extractutils and do some sanity checks
diff --git a/omni_zenfone6.mk b/omni_rog2.mk
similarity index 73%
rename from omni_zenfone6.mk
rename to omni_rog2.mk
index d21543d..178a1f2 100644
--- a/omni_zenfone6.mk
+++ b/omni_rog2.mk
@@ -36,25 +36,25 @@
 $(call inherit-product, vendor/omni/config/common.mk)
 
 # Inherit from hardware-specific part of the product configuration
-$(call inherit-product, device/asus/zenfone6/device.mk)
+$(call inherit-product, device/asus/rog2/device.mk)
 
 # Discard inherited values and use our own instead.
-PRODUCT_DEVICE := zenfone6
-PRODUCT_NAME := omni_zenfone6
+PRODUCT_DEVICE := rog2
+PRODUCT_NAME := omni_rog2
 PRODUCT_BRAND := asus
-PRODUCT_MODEL := ASUS_I01WD
+PRODUCT_MODEL := ASUS_I001D
 PRODUCT_MANUFACTURER := asus
 
-TARGET_DEVICE := WW_I01WD
-PRODUCT_SYSTEM_DEVICE := ASUS_I01WD
-PRODUCT_SYSTEM_NAME := WW_I01WD
+TARGET_DEVICE := WW_I001D
+PRODUCT_SYSTEM_DEVICE := ASUS_I001D
+PRODUCT_SYSTEM_NAME := WW_I001D
 
 OMNI_PRODUCT_PROPERTIES += \
-    ro.build.product=ZS630KL
+    ro.build.product=ZS660KL
 
-VENDOR_RELEASE := 10/QP1A.190711.005/17.1810.1911.110-0:user/release-keys
-BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)
-OMNI_BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)
-OMNI_PRIVATE_BUILD_DESC := "'QP1A.190711.005.WW_Phone-17.1810.1911.110-0'"
+VENDOR_RELEASE := 10/QKQ1.190825.002/17.0210.1912.28-0:user/release-keys
+BUILD_FINGERPRINT := asus/WW_I001D/ASUS_I001_1:$(VENDOR_RELEASE)
+OMNI_BUILD_FINGERPRINT := asus/WW_I001D/ASUS_I001_1:$(VENDOR_RELEASE)
+OMNI_PRIVATE_BUILD_DESC := "'QKQ1.190825.002.WW_Phone-17.0210.1912.28-0'"
 
-PLATFORM_SECURITY_PATCH_OVERRIDE := 2019-11-05
\ No newline at end of file
+PLATFORM_SECURITY_PATCH_OVERRIDE := 2019-12-055
\ No newline at end of file
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index aea3363..1e313b3 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -20,7 +20,7 @@
 set -e
 
 # Required!
-DEVICE=zenfone6
+DEVICE=rog2
 VENDOR=asus
 
 INITIAL_COPYRIGHT_YEAR=2019
@@ -42,7 +42,7 @@
 setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
 
 # Copyright headers and guards
-write_headers "zenfone6"
+write_headers "rog2"
 
 # The standard blobs
 write_makefiles "$MY_DIR"/proprietary-files.txt