d2spr: Switch to AICP

3 files changed, 32 insertions, 23 deletions

diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..6860fb1
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,32 @@
+[
+  {
+    "repository": "CyanogenMod/android_device_samsung_d2-common",
+    "target_path": "device/samsung/d2-common",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository": "CyanogenMod/android_device_samsung_msm8960-common",
+    "target_path": "device/samsung/msm8960-common",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository": "CyanogenMod/android_device_samsung_qcom-common",
+    "target_path": "device/samsung/qcom-common",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository": "AICP/proprietary_vendor_samsung",
+    "target_path": "vendor/samsung",
+    "branch":      "mm6.0"
+  },
+  {
+    "repository":  "CyanogenMod/android_hardware_samsung",
+    "target_path": "hardware/samsung",
+    "branch":      "cm-13.0"
+  },
+  {
+    "repository": "CyanogenMod/android_kernel_samsung_d2",
+    "target_path": "kernel/samsung/d2",
+    "branch":      "cm-13.0"
+  }
+]
diff --git a/cm.dependencies b/cm.dependencies
deleted file mode 100644
index 66481a4..0000000
--- a/cm.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_samsung_d2-common",
-    "target_path": "device/samsung/d2-common"
-  }
-]
diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index 1b1d9a7..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-$(call inherit-product, device/samsung/d2spr/full_d2spr.mk)
-
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=d2spr \
-    TARGET_DEVICE=d2spr \
-    BUILD_FINGERPRINT="samsung/d2spr/d2spr:4.4.2/KOT49H/L710VPUDNJ2:user/release-keys" \
-    PRIVATE_BUILD_DESC="d2spr-user 4.4.2 KOT49H L710VPUDNJ2 release-keys"
-
-PRODUCT_NAME := cm_d2spr
-PRODUCT_DEVICE := d2spr
-