diff --git a/config/cdma.mk b/config/cdma.mk
index bd1a6994..e69de29b 100644
--- a/config/cdma.mk
+++ b/config/cdma.mk
@@ -1,3 +0,0 @@
-# CDMA APN list
-PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/apns-conf-cdma.xml:system/etc/apns-conf.xml
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 1e85f2f8..b6fe356b 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -14,3 +14,16 @@ ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip
endif
+
+# World APN list
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+# World SPN overrides list
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+ Stk
+
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index ec5e2942..60fd1f2e 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -20,3 +20,15 @@ ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip
endif
+# World APN list
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+
+# World SPN overrides list
+PRODUCT_COPY_FILES += \
+ vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
+
+# SIM Toolkit
+PRODUCT_PACKAGES += \
+ Stk
+
diff --git a/config/gsm.mk b/config/gsm.mk
index 58a8af56..e69de29b 100644
--- a/config/gsm.mk
+++ b/config/gsm.mk
@@ -1,12 +0,0 @@
-# GSM APN list
-PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-
-# GSM SPN overrides list
-PRODUCT_COPY_FILES += \
- vendor/cm/prebuilt/common/etc/spn-conf.xml:system/etc/spn-conf.xml
-
-# SIM Toolkit
-PRODUCT_PACKAGES += \
- Stk
-
diff --git a/prebuilt/common/etc/apns-conf-cdma.xml b/prebuilt/common/etc/apns-conf-cdma.xml
deleted file mode 100644
index aa8bcf8b..00000000
--- a/prebuilt/common/etc/apns-conf-cdma.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilt/common/etc/apns-conf-cdma.xml b/prebuilt/common/etc/apns-conf-cdma.xml
new file mode 120000
index 00000000..57dbe63a
--- /dev/null
+++ b/prebuilt/common/etc/apns-conf-cdma.xml
@@ -0,0 +1 @@
+apns-conf.xml
\ No newline at end of file
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index e277ee78..9a583d8c 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -20,6 +20,7 @@
+
@@ -34,6 +35,14 @@
+
+
+
+
+
+
+
+
@@ -51,10 +60,10 @@
-
-
+
+
@@ -70,14 +79,12 @@
+
+
-
-
-
-
@@ -235,10 +242,20 @@
+
+
+
+
+
+
+
+
+
+
@@ -249,6 +266,8 @@
+
+
@@ -328,6 +347,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -406,8 +441,10 @@
-
-
+
+
+
+
@@ -418,7 +455,7 @@
-
+
@@ -445,15 +482,15 @@
-
-
+
+
-
+
@@ -540,6 +577,7 @@
+
@@ -548,7 +586,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -557,12 +606,16 @@
+
+
+
-
-
-
-
+
+
+
+
+
@@ -590,7 +643,7 @@
-
+
@@ -619,19 +672,42 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -657,7 +733,6 @@
-
@@ -675,6 +750,7 @@
+
@@ -766,10 +842,10 @@
-
-
+
+
@@ -779,7 +855,6 @@
-
@@ -819,54 +894,11 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -903,6 +935,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1034,20 +1110,20 @@
-
-
-
-
+
-
+
+
+
+
@@ -1089,6 +1165,8 @@
+
+
@@ -1098,8 +1176,6 @@
-
-
@@ -1167,12 +1243,12 @@
+
+
-
-
@@ -1184,9 +1260,11 @@
+
+
-
+
@@ -1204,6 +1282,8 @@
+
+
@@ -1212,8 +1292,6 @@
-
-
@@ -1283,7 +1361,7 @@
-
+
@@ -1294,7 +1372,6 @@
-
@@ -1302,10 +1379,10 @@
-
-
-
-
+
+
+
+
@@ -1340,6 +1417,8 @@
+
+
@@ -1364,12 +1443,12 @@
+
+
-
-
@@ -1408,6 +1487,7 @@
+
@@ -1438,19 +1518,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-