19 files changed, 74 insertions, 75 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c5e8751..30304ac 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -22,7 +22,7 @@
 # definition file).
 #
 
-COMMON_PATH := device/xiaomi/wayne-common
+COMMON_PATH := device/xiaomi/sdm660-common
 
 BOARD_VENDOR := xiaomi
 
@@ -64,7 +64,6 @@ BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_KERNEL_SOURCE := kernel/xiaomi/sdm660
-TARGET_KERNEL_CONFIG := wayne-perf_defconfig
 TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
 
 # QCOM hardware
@@ -197,9 +196,9 @@ DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
 DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
 
 # Init
-TARGET_INIT_VENDOR_LIB := libinit_wayne
+TARGET_INIT_VENDOR_LIB := libinit_sdm660
 TARGET_PLATFORM_DEVICE_BASE := /devices/soc/
-TARGET_RECOVERY_DEVICE_MODULES := libinit_wayne
+TARGET_RECOVERY_DEVICE_MODULES := libinit_sdm660
 
 # Keystore
 TARGET_PROVIDES_KEYMASTER := true
@@ -282,4 +281,4 @@ WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
 # Inherit the proprietary files
--include vendor/xiaomi/wayne-common/BoardConfigVendor.mk
+-include vendor/xiaomi/sdm660-common/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index e9d629b..ed63ec1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This repository contains common device configuration for Xiaomi wayne-based devices
+This repository contains common device configuration for Xiaomi sdm660-based devices
 
 ## Copyright
 
diff --git a/biometrics/Android.bp b/biometrics/Android.bp
index d6d1362..dacc3e3 100644
--- a/biometrics/Android.bp
+++ b/biometrics/Android.bp
@@ -14,10 +14,10 @@
 // limitations under the License.
 
 cc_binary {
-    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne",
+    name: "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660",
     relative_install_path: "hw",
     defaults: ["hidl_defaults"],
-    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc"],
+    init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc"],
     srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
     shared_libs: [
         "libbase",
diff --git a/biometrics/BiometricsFingerprint.cpp b/biometrics/BiometricsFingerprint.cpp
index bd934d2..42243ab 100644
--- a/biometrics/BiometricsFingerprint.cpp
+++ b/biometrics/BiometricsFingerprint.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660"
 
 #include <cutils/properties.h>
 
diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc
index d3890ed..00312b3 100644
--- a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne.rc
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc
@@ -11,7 +11,7 @@ on boot
     chown system system /sys/devices/soc/soc:fpc1020/wakeup_enable
     chmod 0660 /sys/devices/soc/soc:fpc1020/wakeup_enable
 
-service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne
+service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660
     class late_start
     user system
     group system input
diff --git a/biometrics/service.cpp b/biometrics/service.cpp
index ca36c46..bf833b3 100644
--- a/biometrics/service.cpp
+++ b/biometrics/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne"
+#define LOG_TAG "android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660"
 
 #include <android/log.h>
 #include <hidl/HidlTransportSupport.h>
diff --git a/extract-files.sh b/extract-files.sh
index 0d72d59..df252d3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-DEVICE_COMMON=wayne-common
+DEVICE_COMMON=sdm660-common
 VENDOR=xiaomi
 
 # Load extract_utils and do some sanity checks
diff --git a/init/Android.mk b/init/Android.mk
index fc4a5ba..488bdfc 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -21,9 +21,9 @@ include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := \
     system/core/base/include \
     system/core/init
-LOCAL_MODULE := libinit_wayne
+LOCAL_MODULE := libinit_sdm660
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := init_wayne.cpp
+LOCAL_SRC_FILES := init_sdm660.cpp
 LOCAL_STATIC_LIBRARIES := \
     libbase \
     libselinux
diff --git a/init/init_wayne.cpp b/init/init_sdm660.cpp
index dc6a4a2..5b76c75 100644
--- a/init/init_wayne.cpp
+++ b/init/init_sdm660.cpp
@@ -40,7 +40,7 @@
 
 #include "vendor_init.h"
 #include "property_service.h"
-#include "init_wayne.h"
+#include "init_sdm660.h"
 
 using android::base::GetProperty;
 using android::init::property_set;
diff --git a/init/init_wayne.h b/init/init_sdm660.h
index 9630892..d25d9a2 100644
--- a/init/init_wayne.h
+++ b/init/init_sdm660.h
@@ -28,9 +28,9 @@
    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __INIT_WAYNE__H__
-#define __INIT_WAYNE__H__
+#ifndef __INIT_SDM660__H__
+#define __INIT_SDM660__H__
 #ifdef TARGET_HAVE_LIBINIT
 void init_target_properties();
 #endif
-#endif /* __INIT_WAYNE__H__ */
+#endif /* __INIT_SDM660__H__ */
diff --git a/light/Android.bp b/light/Android.bp
index a60fcf8..e05d16d 100644
--- a/light/Android.bp
+++ b/light/Android.bp
@@ -15,8 +15,8 @@
 
 cc_binary {
     defaults: ["hidl_defaults"],
-    name: "android.hardware.light@2.0-service.xiaomi_wayne",
-    init_rc: ["android.hardware.light@2.0-service.xiaomi_wayne.rc"],
+    name: "android.hardware.light@2.0-service.xiaomi_sdm660",
+    init_rc: ["android.hardware.light@2.0-service.xiaomi_sdm660.rc"],
     srcs: ["service.cpp", "Light.cpp"],
     shared_libs: [
 	"libhardware",
diff --git a/light/Light.cpp b/light/Light.cpp
index d1981bb..780d3ab 100644
--- a/light/Light.cpp
+++ b/light/Light.cpp
@@ -16,7 +16,7 @@
 
 //Author := dev_harsh1998, Isaac Chen
 
-#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_wayne"
+#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660"
 
 #include <log/log.h>
 #include <fstream>
@@ -86,7 +86,7 @@ static std::string getScaledRamp(uint32_t brightness) {
     return ramp;
 }
 
-static void handleWayneBacklight(Type /*type*/, const LightState& state) {
+static void handleXiaomiBacklight(Type /*type*/, const LightState& state) {
     uint32_t brightness = state.color & 0xFF;
     brightness *= 16; // HACK
     set(LCD_LED BRIGHTNESS, brightness);
@@ -152,7 +152,7 @@ static std::vector<std::pair<Type, LightState>> notificationStates = {
     { Type::BATTERY, offState },
 };
 
-static void handleWayneNotification(Type type, const LightState& state) {
+static void handleXiaomiNotification(Type type, const LightState& state) {
     for(auto it : notificationStates) {
         if (it.first == type) {
             it.second = state;
@@ -168,10 +168,10 @@ static void handleWayneNotification(Type type, const LightState& state) {
 }
 
 static std::map<Type, std::function<void(Type type, const LightState&)>> lights = {
-    {Type::BACKLIGHT, handleWayneBacklight},
-    {Type::NOTIFICATIONS, handleWayneNotification},
-    {Type::BATTERY, handleWayneNotification},
-    {Type::ATTENTION, handleWayneNotification},
+    {Type::BACKLIGHT, handleXiaomiBacklight},
+    {Type::NOTIFICATIONS, handleXiaomiNotification},
+    {Type::BATTERY, handleXiaomiNotification},
+    {Type::ATTENTION, handleXiaomiNotification},
 };
 
 Light::Light() {}
diff --git a/light/android.hardware.light@2.0-service.xiaomi_wayne.rc b/light/android.hardware.light@2.0-service.xiaomi_sdm660.rc
index f803030..ba0f41a 100644
--- a/light/android.hardware.light@2.0-service.xiaomi_wayne.rc
+++ b/light/android.hardware.light@2.0-service.xiaomi_sdm660.rc
@@ -14,7 +14,7 @@ on boot
     chmod 660 /sys/class/leds/red/ramp_step_ms
     chmod 660 /sys/class/leds/red/start_idx
 
-service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_wayne
+service vendor.light-hal-2-0 /vendor/bin/hw/android.hardware.light@2.0-service.xiaomi_sdm660
     class hal
     user system
     group system
diff --git a/light/service.cpp b/light/service.cpp
index abefdc0..8f6fa88 100644
--- a/light/service.cpp
+++ b/light/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_wayne"
+#define LOG_TAG "android.hardware.light@2.0-service.xiaomi_sdm660"
 
 #include <hidl/HidlTransportSupport.h>
 
diff --git a/wayne.mk b/sdm660.mk
index fb36356..b46c85c 100644
--- a/wayne.mk
+++ b/sdm660.mk
@@ -22,9 +22,9 @@
 #
 
 # Inherit proprietary files
-$(call inherit-product, vendor/xiaomi/wayne-common/wayne-common-vendor.mk)
+$(call inherit-product, vendor/xiaomi/sdm660-common/sdm660-common-vendor.mk)
 
-COMMON_PATH := device/xiaomi/wayne-common
+COMMON_PATH := device/xiaomi/sdm660-common
 
 # Inherit properties
 $(call inherit-product, $(COMMON_PATH)/properties.mk)
@@ -136,7 +136,7 @@ PRODUCT_COPY_FILES += \
 
 # Biometrics
 PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_wayne
+    android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660
 
 PRODUCT_PACKAGES += \
     org.ifaa.android.manager
@@ -282,7 +282,7 @@ PRODUCT_COPY_FILES += \
 
 # Lights
 PRODUCT_PACKAGES += \
-    android.hardware.light@2.0-service.xiaomi_wayne
+    android.hardware.light@2.0-service.xiaomi_sdm660
 
 # LiveDisplay native
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 6939ff5..81d9822 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -1,5 +1,5 @@
 # Biometric
-/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_wayne u:object_r:hal_fingerprint_wayne_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.xiaomi_sdm660 u:object_r:hal_fingerprint_sdm660_exec:s0
 
 # Fpc Fingerprint
 /sys/devices/soc/soc:fpc1020(/.*)?		u:object_r:fingerprint_sysfs:s0
@@ -27,7 +27,7 @@
 /vendor/usr/keylayout(/.*)?                     u:object_r:vendor_keylayout_file:s0
 
 # Light HAL
-/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.xiaomi_wayne u:object_r:hal_light_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.xiaomi_sdm660 u:object_r:hal_light_default_exec:s0
 
 # Mlipay
 /(vendor|system/vendor)/bin/mlipayd@1.1         u:object_r:hal_mlipay_default_exec:s0
diff --git a/sepolicy/vendor/hal_fingerprint_sdm660.te b/sepolicy/vendor/hal_fingerprint_sdm660.te
new file mode 100644
index 0000000..57cc91e
--- /dev/null
+++ b/sepolicy/vendor/hal_fingerprint_sdm660.te
@@ -0,0 +1,39 @@
+type hal_fingerprint_sdm660, domain, binder_in_vendor_violators;
+hal_server_domain(hal_fingerprint_sdm660, hal_fingerprint)
+ 
+type hal_fingerprint_sdm660_exec, exec_type, vendor_file_type, file_type;
+typeattribute hal_fingerprint_sdm660 data_between_core_and_vendor_violators;
+binder_use(hal_fingerprint_sdm660)
+init_daemon_domain(hal_fingerprint_sdm660)
+
+allow hal_fingerprint_sdm660 fingerprint_device:chr_file { read write open ioctl };
+allow hal_fingerprint_sdm660 { tee_device uhid_device }:chr_file { read write open ioctl };
+allow hal_fingerprint_sdm660 fingerprint_data_file:file rw_file_perms;
+allow hal_fingerprint_sdm660 fingerprintd_data_file:dir rw_dir_perms;
+allow hal_fingerprint_sdm660 fingerprintd_data_file:file create_file_perms;
+allow hal_fingerprint_sdm660 { fuse mnt_user_file storage_file }:dir search;
+allow hal_fingerprint_sdm660 { mnt_user_file storage_file }:lnk_file read;
+allow hal_fingerprint_sdm660 fingerprint_sysfs:dir r_dir_perms;
+allow hal_fingerprint_sdm660 fingerprint_sysfs:file rw_file_perms;
+
+allow hal_fingerprint_sdm660 hal_fingerprint_sdm660:netlink_socket { create bind write read };
+
+binder_call(hal_fingerprint_sdm660, vndservicemanager)
+binder_call(hal_fingerprint_sdm660, hal_perf_default)
+
+binder_use(hal_fingerprint_sdm660)
+
+r_dir_file(hal_fingerprint_sdm660, firmware_file)
+
+add_service(hal_fingerprint_sdm660, goodixvnd_service)
+add_hwservice(hal_fingerprint_sdm660, goodixhw_service)
+
+allow hal_fingerprint_sdm660 vndbinder_device:chr_file ioctl;
+
+get_prop(hal_fingerprint_sdm660, hal_fingerprint_prop)
+set_prop(hal_fingerprint_sdm660, hal_fingerprint_prop)
+
+vndbinder_use(hal_fingerprint_sdm660)
+
+dontaudit hal_fingerprint_sdm660 { media_rw_data_file sdcardfs}:dir search;
+dontaudit hal_fingerprint_sdm660 media_rw_data_file:dir { read open };
diff --git a/sepolicy/vendor/hal_fingerprint_wayne.te b/sepolicy/vendor/hal_fingerprint_wayne.te
deleted file mode 100644
index 11a99de..0000000
--- a/sepolicy/vendor/hal_fingerprint_wayne.te
+++ /dev/null
@@ -1,39 +0,0 @@
-type hal_fingerprint_wayne, domain, binder_in_vendor_violators;
-hal_server_domain(hal_fingerprint_wayne, hal_fingerprint)
- 
-type hal_fingerprint_wayne_exec, exec_type, vendor_file_type, file_type;
-typeattribute hal_fingerprint_wayne data_between_core_and_vendor_violators;
-binder_use(hal_fingerprint_wayne)
-init_daemon_domain(hal_fingerprint_wayne)
-
-allow hal_fingerprint_wayne fingerprint_device:chr_file { read write open ioctl };
-allow hal_fingerprint_wayne { tee_device uhid_device }:chr_file { read write open ioctl };
-allow hal_fingerprint_wayne fingerprint_data_file:file rw_file_perms;
-allow hal_fingerprint_wayne fingerprintd_data_file:dir rw_dir_perms;
-allow hal_fingerprint_wayne fingerprintd_data_file:file create_file_perms;
-allow hal_fingerprint_wayne { fuse mnt_user_file storage_file }:dir search;
-allow hal_fingerprint_wayne { mnt_user_file storage_file }:lnk_file read;
-allow hal_fingerprint_wayne fingerprint_sysfs:dir r_dir_perms;
-allow hal_fingerprint_wayne fingerprint_sysfs:file rw_file_perms;
-
-allow hal_fingerprint_wayne hal_fingerprint_wayne:netlink_socket { create bind write read };
-
-binder_call(hal_fingerprint_wayne, vndservicemanager)
-binder_call(hal_fingerprint_wayne, hal_perf_default)
-
-binder_use(hal_fingerprint_wayne)
-
-r_dir_file(hal_fingerprint_wayne, firmware_file)
-
-add_service(hal_fingerprint_wayne, goodixvnd_service)
-add_hwservice(hal_fingerprint_wayne, goodixhw_service)
-
-allow hal_fingerprint_wayne vndbinder_device:chr_file ioctl;
-
-get_prop(hal_fingerprint_wayne, hal_fingerprint_prop)
-set_prop(hal_fingerprint_wayne, hal_fingerprint_prop)
-
-vndbinder_use(hal_fingerprint_wayne)
-
-dontaudit hal_fingerprint_wayne { media_rw_data_file sdcardfs}:dir search;
-dontaudit hal_fingerprint_wayne media_rw_data_file:dir { read open };
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index f6375b4..10db1f8 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-DEVICE_COMMON=wayne-common
+DEVICE_COMMON=sdm660-common
 VENDOR=xiaomi
 
 INITIAL_COPYRIGHT_YEAR=2018