Update to bring in line with CM 10.2

Change-Id: I229ff4431281769474cf2c76a715d33f9a5710b4
ChameleonOS · Sep 16, 2013 · e3058ca · e3058ca
1 parent 6044e58
commit e3058ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 86 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -26,6 +26,9 @@
 # inherit from the proprietary version
 -include vendor/samsung/d2vzw/BoardConfigVendor.mk
 
+# Assert
+TARGET_OTA_ASSERT_DEVICE := d2vzw
+
 # Kernel
 TARGET_KERNEL_CONFIG        := cyanogen_d2vzw_defconfig
 
diff --git a/cos.dependencies b/cos.dependencies
@@ -31,7 +31,7 @@
   },
   {
     "project": "TheMuppets",
-    "repository": "android_vendor_samsung",
+    "repository": "proprietary_vendor_samsung",
     "target_path": "vendor/samsung",
     "branch": "cm-10.2"
   }

diff --git a/full_d2vzw.mk b/full_d2vzw.mk
@@ -29,10 +29,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from d2vzw device
 $(call inherit-product, device/samsung/d2vzw/device.mk)
 
-# VZW APN List
-PRODUCT_COPY_FILES += \
-    device/samsung/d2vzw/prebuilt/common/etc/apns-conf-vzw.xml:system/etc/apns-conf.xml
-
 # Set those variables here to overwrite the inherited values.
 PRODUCT_NAME := full_d2vzw
 PRODUCT_DEVICE := d2vzw

diff --git a/prebuilt/common/etc/apns-conf-vzw.xml b/prebuilt/common/etc/apns-conf-vzw.xml