g5 -> v20

Change-Id: I12aeeac9172184d07fbd6da0147a73587e41f2c1

7 files changed, 11 insertions, 11 deletions

diff --git a/Android.mk b/Android.mk
index 8a67e11..f944441 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ifneq ($(filter g5 h830 h850,$(TARGET_DEVICE)),)
+ifneq ($(filter v20 h918 h910,$(TARGET_DEVICE)),)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -95,6 +95,6 @@ $(WIDEVINE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 ALL_DEFAULT_INSTALLED_MODULES += $(WIDEVINE_SYMLINKS)
 # END WIDEVINE Images
 
-include device/lge/g5-common/tftp.mk
+include device/lge/v20-common/tftp.mk
 
 endif
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index bd13e50..10a5cfb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -16,7 +16,7 @@
 
 BOARD_VENDOR := lge
 
-COMMON_PATH := device/lge/g5-common
+COMMON_PATH := device/lge/v20-common
 
 TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
 
@@ -172,7 +172,7 @@ BOARD_USES_QC_TIME_SERVICES := true
 TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom
 
 # RIL
-BOARD_RIL_CLASS := ../../../device/lge/g5-common/ril/
+BOARD_RIL_CLASS := ../../../device/lge/v20-common/ril/
 TARGET_RIL_VARIANT := caf
 
 # SELinux policies
@@ -197,4 +197,4 @@ WIFI_DRIVER_FW_PATH_AP      := "/system/etc/firmware/fw_bcmdhd_apsta.bin"
 WIFI_DRIVER_FW_PATH_STA     := "/system/etc/firmware/fw_bcmdhd.bin"
 
 # inherit from the proprietary version
--include vendor/lge/g5-common/BoardConfigVendor.mk
+-include vendor/lge/v20-common/BoardConfigVendor.mk
diff --git a/recovery/Android.mk b/recovery/Android.mk
index f4de531..8aadd5d 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -3,6 +3,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := bootable/recovery
 LOCAL_SRC_FILES := recovery_updater.cpp
-LOCAL_MODULE := librecovery_updater_g5
+LOCAL_MODULE := librecovery_updater_v20
 LOCAL_MODULE_TAGS := eng
 include $(BUILD_STATIC_LIBRARY)
diff --git a/recovery/recovery_updater.cpp b/recovery/recovery_updater.cpp
index e2bc2bb..a23bbdf 100644
--- a/recovery/recovery_updater.cpp
+++ b/recovery/recovery_updater.cpp
@@ -184,5 +184,5 @@ Value * VerifyTrustZoneFn(const char *name, State *state, int argc, Expr *argv[]
 }
 
 void Register_librecovery_updater_hima() {
-    RegisterFunction("g5.verify_trustzone", VerifyTrustZoneFn);
+    RegisterFunction("v20.verify_trustzone", VerifyTrustZoneFn);
 }
diff --git a/releasetools.py b/releasetools.py
index 373ba9c..0172602 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -31,6 +31,6 @@ def AddTrustZoneAssertion(info, input_zip):
   if m:
     versions = m.group(1).split('|')
     if len(versions) and '*' not in versions:
-      cmd = 'assert(g5.verify_trustzone(' + ','.join(['"%s"' % tz for tz in versions]) + ') == "1");'
+      cmd = 'assert(v20.verify_trustzone(' + ','.join(['"%s"' % tz for tz in versions]) + ') == "1");'
       info.script.AppendExtra(cmd)
   return
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 9366ba2..a6248ad 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -34,7 +34,7 @@ fi
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$CM_ROOT" true
 
 # Copyright headers and common guards
-write_headers "g5 h830 h850"
+write_headers "v20 h918 h910"
 
 # The standard blobs
 write_makefiles "$MY_DIR"/proprietary-files.txt
diff --git a/g5.mk b/v20.mk
index 42aa168..bc560f8 100644
--- a/g5.mk
+++ b/v20.mk
@@ -15,7 +15,7 @@
 #
 
 # Inherit proprietary blobs
-$(call inherit-product-if-exists, vendor/lge/g5-common/g5-common-vendor.mk)
+$(call inherit-product-if-exists, vendor/lge/v20-common/v20-common-vendor.mk)
 
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
@@ -251,7 +251,7 @@ PRODUCT_PACKAGES += \
 
 # Recovery
 PRODUCT_PACKAGES += \
-    librecovery_updater_g5
+    librecovery_updater_v20
 
 # RIL
 PRODUCT_PACKAGES += \