From 84a340f1e4b4ddd2307ab1b84a38058a73c09b35 Mon Sep 17 00:00:00 2001 From: Rick C Date: Thu, 2 Aug 2012 22:30:13 -0400 Subject: [PATCH] Allow toro/d2vzw coexistence --- d2vzw/proprietary/apps/Android.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/d2vzw/proprietary/apps/Android.mk b/d2vzw/proprietary/apps/Android.mk index 3eb5b798ef..302bab889c 100644 --- 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,7 +35,6 @@ 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 @@ -43,3 +42,5 @@ LOCAL_MODULE_TAGS := optional LOCAL_CERTIFICATE := platform LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) include $(BUILD_PREBUILT) + +endif