m7spr: Switch to AICPHEADmm6.0

3 files changed, 27 insertions, 20 deletions

diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..80f4435
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,27 @@
+[
+  {
+    "repository":  "AICP/device_htc_m7-common",
+    "target_path": "device/htc/m7-common",
+    "branch":      "mm6.0"
+  },
+  {
+    "repository":  "CyanogenMod/android_device_htc_msm8960-common",
+    "target_path": "device/htc/msm8960-common",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository": "CyanogenMod/android_external_sony_boringssl-compat",
+    "target_path": "external/sony/boringssl-compat",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository":  "CyanogenMod/android_kernel_htc_msm8960",
+    "target_path": "kernel/htc/msm8960",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository":  "AICP/proprietary_vendor_htc",
+    "target_path": "vendor/htc",
+    "branch":      "mm6.0"
+  }
+]
diff --git a/cm.dependencies b/cm.dependencies
deleted file mode 100644
index 3c6ae0e..0000000
--- a/cm.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_htc_m7-common",
-    "target_path": "device/htc/m7-common"
-  }
-]
diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index 176dbba..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-$(call inherit-product, device/htc/m7spr/full_m7spr.mk)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=sprint_wwe \
-    BUILD_ID=LRX22F \
-    BUILD_FINGERPRINT="htc/sprint_wwe/m7wls:5.0.2/LRX22F/461956.2:user/release-keys" \
-    PRIVATE_BUILD_DESC="6.16.651.2 CL461956 release-keys"
-
-PRODUCT_NAME := cm_m7spr
-PRODUCT_DEVICE := m7spr