Merge pull request TheMuppets#91 from fitsnugly/jellybean

Allow toro/d2vzw coexistence
PterX · Aug 3, 2012 · 2cb924e · 2cb924e
2 parents 98aff9e + 84a340f
commit 2cb924e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/d2vzw/proprietary/apps/Android.mk b/d2vzw/proprietary/apps/Android.mk
@@ -14,8 +14,9 @@
 
 LOCAL_PATH:=$(call my-dir)
 
-include $(CLEAR_VARS)
+ifeq ($(TARGET_DEVICE),d2vzw)
 
+include $(CLEAR_VARS)
 LOCAL_MODULE := VZWAPNLib
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
@@ -25,7 +26,6 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := vzwapnpermission
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
@@ -35,11 +35,12 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := VZWAPNService
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_TAGS := optional
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
+
+endif