n7100: MM bringup for CM

5 files changed, 43 insertions, 36 deletions

diff --git a/cm.dependencies b/cm.dependencies
new file mode 100644
index 0000000..a78a94f
--- /dev/null
+++ b/cm.dependencies
@@ -0,0 +1,18 @@
+[
+    {
+        "repository": "android_device_samsung_smdk4412-common",
+        "target_path": "device/samsung/smdk4412-common"
+    },
+    {
+        "repository": "android_kernel_samsung_smdk4412",
+        "target_path": "kernel/samsung/smdk4412"
+    },
+    {
+        "repository": "android_packages_apps_SamsungServiceMode",
+        "target_path": "packages/apps/SamsungServiceMode"
+    },
+    {
+        "repository": "android_hardware_samsung",
+        "target_path": "hardware/samsung"
+    }
+]
diff --git a/cm.mk b/cm.mk
index 02b3945..2214f55 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,5 +1,28 @@
-# Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
+# Inherit device configuration
+$(call inherit-product, device/samsung/n7100/full_n7100.mk)
+
+# Copyright (C) 2012 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.
+
+#
+# This file is the build configuration for a full Android
+# build for toro hardware. This cleanly combines a set of
+# device-specific aspects (drivers) with a device-agnostic
+# product configuration (apps). Except for a few implementation
+# details, it only fundamentally contains two inherit-product
+# lines, full and toro, hence its name.
+#
 
 # Release name
 PRODUCT_RELEASE_NAME := n7100
diff --git a/n7100.mk b/n7100.mk
index 38159a8..9c683fc 100644
--- a/n7100.mk
+++ b/n7100.mk
@@ -72,7 +72,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     packages/apps/Nfc/migrate_nfc.txt:system/etc/updatecmds/migrate_nfc.txt \
     frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \
-    frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
     frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml
 
 # NFCEE access control
diff --git a/pa.dependencies b/pa.dependencies
deleted file mode 100644
index d79b58f..0000000
--- a/pa.dependencies
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-    {
-        "remote":      "github",
-        "repository":  "tilaksidduram/android_device_samsung_smdk4412-common",
-        "target_path": "device/samsung/smdk4412-common",
-        "revision":    "lollipop-mr1"
-    },
-    {
-        "remote":      "github",
-        "repository":  "AOSPA-L/android_kernel_samsung_smdk4412",
-        "target_path": "kernel/samsung/smdk4412",
-        "revision":    "lollipop-mr1"
-    },
-    {
-        "remote":      "github",
-        "repository":  "CyanogenMod/android_packages_apps_SamsungServiceMode",
-        "target_path": "packages/apps/SamsungServiceMode",
-        "revision":    "cm-12.1"
-    },
-    {
-        "remote":      "github",
-        "repository":  "tilaksidduram/android_hardware_samsung",
-        "target_path": "hardware/samsung",
-        "revision":    "lollipop-mr1"
-    },
-    {
-        "remote":      "github",
-        "repository":  "CrazyWeasel/proprietary_vendor_samsung",
-        "target_path": "vendor/samsung",
-        "revision":    "n-2.1"
-    }
-]
diff --git a/system.prop b/system.prop
index 22fda1f..47d42de 100644
--- a/system.prop
+++ b/system.prop
@@ -7,4 +7,3 @@ rild.libpath=/system/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
 ro.sf.lcd_density=320
 ro.lcd_min_brightness=20
-ro.pa.device=n7100