flocaf: Switch to AICP MM

3 files changed, 17 insertions, 44 deletions

diff --git a/aicp.dependencies b/aicp.dependencies
new file mode 100644
index 0000000..1702504
--- /dev/null
+++ b/aicp.dependencies
@@ -0,0 +1,17 @@
+[
+  {
+   "repository":  "AICP/kernel_asus_flo",
+   "target_path": "kernel/asus/flo",
+   "branch":      "mm6.0-caf"
+  },
+  {
+   "repository":  "AICP/proprietary_vendor_asus",
+   "target_path": "vendor/asus",
+   "branch":      "mm6.0"
+  },
+  {
+   "repository":  "CyanogenMod/android_external_stlport",
+   "target_path": "external/stlport",
+   "branch":      "cm-13.0"
+  }
+]
diff --git a/cm.dependencies b/cm.dependencies
deleted file mode 100644
index 502bbe5..0000000
--- a/cm.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-   "repository": "android_kernel_asus_flo",
-   "target_path": "kernel/asus/flo"
- },
- {
-   "repository": "android_external_stlport",
-   "target_path": "external/stlport"
- }
-]
diff --git a/cm.mk b/cm.mk
deleted file mode 100644
index 6719b7b..0000000
--- a/cm.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2016 The CyanogenMod Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_tablet_wifionly.mk)
-
-# Enhanced NFC
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
-# Inherit device configuration
-$(call inherit-product, device/asus/flo/full_flo.mk)
-
-## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := flo
-PRODUCT_NAME := cm_flo
-PRODUCT_BRAND := google
-PRODUCT_MODEL := Nexus 7
-PRODUCT_MANUFACTURER := asus
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_NAME=razor \
-    BUILD_FINGERPRINT=google/razor/flo:6.0.1/MMB29Q/2480792:user/release-keys \
-    PRIVATE_BUILD_DESC="razor-user 6.0.1 MMB29Q 2480792 release-keys"