am 91742790: Merge "Increase apn resource files version"
* commit '917427908e94f67b1baedc965699c555105aca37':
Increase apn resource files version
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 543e54d..f6c29c8 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,4 +15,5 @@
#
PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/aosp_toroplus.mk \
$(LOCAL_DIR)/full_toroplus.mk
diff --git a/aosp_toroplus.mk b/aosp_toroplus.mk
new file mode 100644
index 0000000..b48b0eb
--- /dev/null
+++ b/aosp_toroplus.mk
@@ -0,0 +1,18 @@
+#
+# Copyright 2013 The Android Open-Source 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.
+#
+$(call inherit-product, device/samsung/toroplus/full_toroplus.mk)
+
+PRODUCT_NAME := aosp_toroplus
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 0bd120a..d321992 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,6 +17,9 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "Galaxy NexusCDMA 2"
+#define BTM_DEF_LOCAL_NAME "Galaxy NexusCDMA"
+#define BLE_INCLUDED FALSE
+#define BTA_GATT_INCLUDED FALSE
+#define SMP_INCLUDED FALSE
#endif
diff --git a/full_toroplus.mk b/full_toroplus.mk
index cb491f7..d2124ad 100644
--- a/full_toroplus.mk
+++ b/full_toroplus.mk
@@ -25,7 +25,7 @@
PRODUCT_COPY_FILES := device/samsung/toroplus/test-apns-conf_sprint.xml:system/etc/apns-conf.xml
# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
# This is where we'd set a backup provider if we had one
#$(call inherit-product, device/sample/products/backup_overlay.mk)
# Inherit from maguro device
@@ -35,5 +35,5 @@
PRODUCT_NAME := full_toroplus
PRODUCT_DEVICE := toroplus
PRODUCT_BRAND := Android
-PRODUCT_MODEL := Full AOSP on Toroplus
+PRODUCT_MODEL := AOSP on Toroplus
PRODUCT_RESTRICT_VENDOR_FILES := true
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index 6e33ce7..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount point fstype device
-
-/sdcard vfat /dev/block/sda1
-/system ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/system
-/cache ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/cache
-/data ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/userdata
-/misc emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/misc
-/boot emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/boot
-/recovery emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/recovery
-/sbl emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/sbl
-/xloader emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/xloader
-/radio emmc /dev/block/platform/omap/omap_hsmmc.0/by-name/radio
