Moto X unified initial

Change-Id: Ie0ea88434e9343b3d26d1f2adecfcf4f1029a1e0

4 files changed, 37 insertions, 32 deletions

diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..93f3010
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,37 @@
+[
+  {
+    "repository": "CyanogenMod/android_device_qcom_common",
+    "target_path": "device/qcom/common",
+    "branch": "cm-11.0"
+  },
+  {
+    "repository": "Entropic-S/android_device_motorola_qcom-common",
+    "target_path": "device/motorola/qcom-common",
+    "branch": "cm-11.0"
+  },
+  {
+    "repository": "TheMuppets/proprietary_vendor_motorola",
+    "target_path": "vendor/motorola",
+    "branch": "cm-11.0"
+  },
+  {
+    "repository": "TheRingMaster/android_kernel_motorola_msm8960dt-common",
+    "target_path": "kernel/motorola/msm8960dt-common",
+    "branch": "aicp"
+  },
+  {
+    "repository": "CyanogenMod/android_hardware_qcom_display-caf",
+    "target_path": "hardware/qcom/display-caf",
+    "branch": "cm-11.0"
+  },
+  {
+    "repository": "CyanogenMod/android_hardware_qcom_audio-caf",
+    "target_path": "hardware/qcom/audio-caf",
+    "branch": "cm-11.0"
+  },
+  {
+    "repository": "CyanogenMod/android_hardware_qcom_media-caf",
+    "target_path": "hardware/qcom/media-caf",
+    "branch": "cm-11.0"
+  }
+]
\ No newline at end of file
diff --git a/cm.dependencies b/cm.dependencies
deleted file mode 100644
index 3c39585..0000000
--- a/cm.dependencies
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  {
-    "repository": "android_device_qcom_common",
-    "target_path": "device/qcom/common"
-  },
-  {
-    "repository": "android_device_motorola_qcom-common",
-    "target_path": "device/motorola/qcom-common"
-  },
-  {
-    "repository": "android_kernel_motorola_msm8960dt-common",
-    "target_path": "kernel/motorola/msm8960dt-common"
-  }
-]
diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index f45b4f8..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Boot animation
-TARGET_SCREEN_WIDTH := 720
-TARGET_SCREEN_HEIGHT := 1280
-
-# Release name
-PRODUCT_NAME := cm_moto_msm8960dt
-
-$(call inherit-product, device/motorola/moto_msm8960dt/full_moto_msm8960dt.mk)
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 5e02bb4..5c93f93 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -169,10 +169,6 @@
     <!-- Boolean indicating whether the wifi chipset has background scan support -->
     <bool translatable="false" name="config_wifi_background_scan_support">true</bool>
 
-    <!-- Performance profiles -->
-    <string name="config_perf_profile_prop">sys.perf.profile</string>
-    <string name="config_perf_profile_default_entry">1</string>
-
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
         This integer should equal the sum of the corresponding value for each
         of the following keys present: