axon7: Rebrand as axon7

* Keep ailsa_ii for hardware related item (bootloader board name, fingerprint, etc)

Change-Id: I6e0dd403771c10582979ddcbde1b9573a5c5f78c
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>

23 files changed, 35 insertions, 35 deletions

diff --git a/Android.mk b/Android.mk
index bf22387..6adba14 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),ailsa_ii)
+ifeq ($(TARGET_DEVICE),axon7)
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
 include $(CLEAR_VARS)
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 13935db..e82da39 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,4 +14,4 @@
 # limitations under the License.
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_ailsa_ii.mk
+    $(LOCAL_DIR)/full_axon7.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3675a8a..2e3048c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH := device/zte/ailsa_ii
+LOCAL_PATH := device/zte/axon7
 
 TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
 
 
-include device/zte/ailsa_ii/board/*.mk
+include device/zte/axon7/board/*.mk
 
 # inherit from the proprietary version
--include vendor/zte/ailsa_ii/BoardConfigVendor.mk
+-include vendor/zte/axon7/BoardConfigVendor.mk
diff --git a/audio_amplifier/audio_amplifier.c b/audio_amplifier/audio_amplifier.c
index fa145ac..268a2f6 100644
--- a/audio_amplifier/audio_amplifier.c
+++ b/audio_amplifier/audio_amplifier.c
@@ -29,7 +29,7 @@
 #include <dlfcn.h>
 #include <sys/ioctl.h>
 
-#define LOG_TAG "ailsa_ii-tfa98xx"
+#define LOG_TAG "axon7-tfa98xx"
 #include <log/log.h>
 
 #include <hardware/audio_amplifier.h>
@@ -177,7 +177,7 @@ amplifier_module_t HAL_MODULE_INFO_SYM = {
         .module_api_version = AMPLIFIER_MODULE_API_VERSION_0_1,
         .hal_api_version = HARDWARE_HAL_API_VERSION,
         .id = AMPLIFIER_HARDWARE_MODULE_ID,
-        .name = "Ailsa_II amplifier HAL",
+        .name = "Axon7 amplifier HAL",
         .author = "The CyanogenMod Open Source Project",
         .methods = &hal_module_methods,
     },
diff --git a/board/bluetooth.mk b/board/bluetooth.mk
index aa4bc5a..ad77262 100644
--- a/board/bluetooth.mk
+++ b/board/bluetooth.mk
@@ -1,3 +1,3 @@
 # Bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/zte/ailsa_ii/bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/zte/axon7/bluetooth
 BOARD_HAVE_BLUETOOTH := true
diff --git a/board/hardware.mk b/board/hardware.mk
index 6715fc6..a561014 100644
--- a/board/hardware.mk
+++ b/board/hardware.mk
@@ -1,2 +1,2 @@
 BOARD_HARDWARE_CLASS += \
-    device/zte/ailsa_ii/cmhw
+    device/zte/axon7/cmhw
diff --git a/board/kernel.mk b/board/kernel.mk
index 16544b7..a4ed9ef 100644
--- a/board/kernel.mk
+++ b/board/kernel.mk
@@ -10,5 +10,5 @@ TARGET_KERNEL_APPEND_DTB := true
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_KERNEL_SOURCE := kernel/zte/msm8996
-TARGET_KERNEL_CONFIG := lineageos_ailsa_ii_defconfig
+TARGET_KERNEL_CONFIG := lineageos_axon7_defconfig
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
diff --git a/board/qcom-platform.mk b/board/qcom-platform.mk
index 6f78eeb..dfa2084 100644
--- a/board/qcom-platform.mk
+++ b/board/qcom-platform.mk
@@ -19,8 +19,8 @@ ENABLE_CPUSETS := true
 TARGET_USES_64_BIT_BINDER := true
 
 # Init
-TARGET_INIT_VENDOR_LIB := libinit_ailsa_ii
-TARGET_RECOVERY_DEVICE_MODULES := libinit_ailsa_ii
+TARGET_INIT_VENDOR_LIB := libinit_axon7
+TARGET_RECOVERY_DEVICE_MODULES := libinit_axon7
 
 # Qualcomm support
 BOARD_USES_QCOM_HARDWARE := true
diff --git a/board/recovery.mk b/board/recovery.mk
index cb5b649..81cba6e 100644
--- a/board/recovery.mk
+++ b/board/recovery.mk
@@ -1,7 +1,7 @@
 # Assertions
-TARGET_BOARD_INFO_FILE ?= device/zte/ailsa_ii/board-info.txt
+TARGET_BOARD_INFO_FILE ?= device/zte/axon7/board-info.txt
 
 # Recovery
-TARGET_RECOVERY_FSTAB := device/zte/ailsa_ii/rootdir/etc/fstab.qcom
-TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_ailsa_ii
-TARGET_RELEASETOOLS_EXTENSIONS := device/zte/ailsa_ii
+TARGET_RECOVERY_FSTAB := device/zte/axon7/rootdir/etc/fstab.qcom
+TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_axon7
+TARGET_RELEASETOOLS_EXTENSIONS := device/zte/axon7
diff --git a/board/sepolicy.mk b/board/sepolicy.mk
index 02d65d1..479f7fd 100644
--- a/board/sepolicy.mk
+++ b/board/sepolicy.mk
@@ -1,3 +1,3 @@
 # SELinux
 BOARD_SEPOLICY_DIRS += \
-    device/zte/ailsa_ii/sepolicy
+    device/zte/axon7/sepolicy
diff --git a/device.mk b/device.mk
index 176dcd9..0ddb46e 100644
--- a/device.mk
+++ b/device.mk
@@ -20,4 +20,4 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 # Include package config fragments
 include $(LOCAL_PATH)/product/*.mk
 
-$(call inherit-product-if-exists, vendor/zte/ailsa_ii/ailsa_ii-vendor.mk)
+$(call inherit-product-if-exists, vendor/zte/axon7/axon7-vendor.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 9574da5..9d79ad3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-DEVICE=ailsa_ii
+DEVICE=axon7
 VENDOR=zte
 
 # Load extractutils and do some sanity checks
diff --git a/full_ailsa_ii.mk b/full_axon7.mk
index b0aa808..d397dd8 100644
--- a/full_ailsa_ii.mk
+++ b/full_axon7.mk
@@ -19,11 +19,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from idol3 device
-$(call inherit-product, device/zte/ailsa_ii/device.mk)
+$(call inherit-product, device/zte/axon7/device.mk)
 
 # Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := ailsa_ii
-PRODUCT_NAME := full_ailsa_ii
+PRODUCT_DEVICE := axon7
+PRODUCT_NAME := full_axon7
 PRODUCT_BRAND := ZTE
 PRODUCT_MODEL := ZTE A2017U
 PRODUCT_MANUFACTURER := ZTE
diff --git a/gps/Android.mk b/gps/Android.mk
index feba85d..f0b7423 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -16,6 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),ailsa_ii)
+ifeq ($(TARGET_DEVICE),axon7)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 endif
diff --git a/init/Android.mk b/init/Android.mk
index 2b1e2bf..94673cd 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := system/core/init
-LOCAL_SRC_FILES := init_ailsa_ii.cpp
-LOCAL_MODULE := libinit_ailsa_ii
+LOCAL_SRC_FILES := init_axon7.cpp
+LOCAL_MODULE := libinit_axon7
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/init/init_ailsa_ii.cpp b/init/init_axon7.cpp
index a2ff4a0..a2ff4a0 100644
--- a/init/init_ailsa_ii.cpp
+++ b/init/init_axon7.cpp
diff --git a/lineage.mk b/lineage.mk
index 49616c5..f6b27a6 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$(call inherit-product, device/zte/ailsa_ii/full_ailsa_ii.mk)
+$(call inherit-product, device/zte/axon7/full_axon7.mk)
 
 # Inherit some common LineageOS stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
-PRODUCT_NAME := lineage_ailsa_ii
+PRODUCT_NAME := lineage_axon7
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     PRODUCT_NAME="P996A01_N" \
diff --git a/product/recovery.mk b/product/recovery.mk
index d27eab6..908795d 100644
--- a/product/recovery.mk
+++ b/product/recovery.mk
@@ -1,4 +1,4 @@
 # Recovery
 PRODUCT_PACKAGES += \
-    librecovery_updater_ailsa_ii \
+    librecovery_updater_axon7 \
     init.recovery.qcom.rc
diff --git a/recovery/Android.mk b/recovery/Android.mk
index 9f2dc7b..ceb602e 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_ailsa_ii
+LOCAL_MODULE := librecovery_updater_axon7
 LOCAL_MODULE_TAGS := eng
 include $(BUILD_STATIC_LIBRARY)
diff --git a/recovery/recovery_updater.cpp b/recovery/recovery_updater.cpp
index 475d795..cff0eb7 100644
--- a/recovery/recovery_updater.cpp
+++ b/recovery/recovery_updater.cpp
@@ -189,6 +189,6 @@ Value * VerifyTrustZoneFn(const char *name, State *state, int argc, Expr *argv[]
     return StringValue(strdup(ret ? "1" : "0"));
 }
 
-void Register_librecovery_updater_ailsa_ii() {
-    RegisterFunction("ailsa_ii.verify_trustzone", VerifyTrustZoneFn);
+void Register_librecovery_updater_axon7() {
+    RegisterFunction("axon7.verify_trustzone", VerifyTrustZoneFn);
 }
diff --git a/releasetools.py b/releasetools.py
index b32cda4..82a056c 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(ailsa_ii.verify_trustzone(' + ','.join(['"%s"' % tz for tz in versions]) + ') == "1");'
+      cmd = 'assert(axon7.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 bc4e2a8..2472246 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -19,7 +19,7 @@
 set -e
 
 # Required!
-DEVICE=ailsa_ii
+DEVICE=axon7
 VENDOR=zte
 
 INITIAL_COPYRIGHT_YEAR=2016
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3741f0b..14c4c80 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,2 +1,2 @@
-add_lunch_combo lineage_ailsa_ii-eng
-add_lunch_combo lineage_ailsa_ii-userdebug
+add_lunch_combo lineage_axon7-eng
+add_lunch_combo lineage_axon7-userdebug