Commit 0082e0e4 authored by David Kataja Jr's avatar David Kataja Jr
Browse files

update blobs for marlin and sailfish

I have removed some blobs that can be compiled
in the device tree and modified makefiles for
proper compilation and inclusion with the ROM.

Change-Id: I1ffc7b166b1c4cf8b2c732795c0fe891dab71dec
parent d630743a
......@@ -224,16 +224,6 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := VZWAPNLib
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := proprietary/app/VZWAPNLib/VZWAPNLib.apk
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := vzw_msdc_api
LOCAL_MODULE_TAGS := optional
......@@ -288,10 +278,10 @@ LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := CarrierEntitlement
LOCAL_MODULE := AppDirectedSMSService
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/priv-app
LOCAL_SRC_FILES := proprietary/priv-app/CarrierEntitlement/CarrierEntitlement.apk
LOCAL_SRC_FILES := proprietary/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
......@@ -300,10 +290,10 @@ LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := CNEService
LOCAL_MODULE := CarrierEntitlement
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/priv-app
LOCAL_SRC_FILES := proprietary/priv-app/CNEService/CNEService.apk
LOCAL_SRC_FILES := proprietary/priv-app/CarrierEntitlement/CarrierEntitlement.apk
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
......@@ -312,10 +302,10 @@ LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := ConnMetrics
LOCAL_MODULE := CNEService
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/priv-app
LOCAL_SRC_FILES := proprietary/priv-app/ConnMetrics/ConnMetrics.apk
LOCAL_SRC_FILES := proprietary/priv-app/CNEService/CNEService.apk
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
......@@ -422,7 +412,7 @@ LOCAL_MODULE := obdm_stub
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/priv-app
LOCAL_SRC_FILES := proprietary/priv-app/obdm_stub/obdm_stub.apk
LOCAL_CERTIFICATE := platform
LOCAL_CERTIFICATE := PRESIGNED
LOCAL_MODULE_CLASS := APPS
LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
......@@ -513,22 +503,6 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_DEX_PREOPT := false
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := libmotricity.so
LOCAL_MODULE_CLASS := FAKE
LOCAL_MODULE_TAGS := optional
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): TARGET := /system/lib/libmotricity.so
$(LOCAL_BUILT_MODULE): SYMLINK := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM)/priv-app/VzwLcSilent/lib/arm/libmotricity.so
$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/Android.mk
$(LOCAL_BUILT_MODULE):
$(hide) mkdir -p $(dir $@)
$(hide) mkdir -p $(dir $(SYMLINK))
$(hide) rm -rf $@
$(hide) rm -rf $(SYMLINK)
$(hide) ln -sf $(TARGET) $(SYMLINK)
$(hide) touch $@
include $(CLEAR_VARS)
LOCAL_MODULE := VzwOmaTrigger
LOCAL_MODULE_TAGS := optional
......
......@@ -39,7 +39,6 @@ PRODUCT_PACKAGES += \
RcsService \
shutdownlistener \
TimeService \
VZWAPNLib \
vzw_msdc_api \
xdivert
......@@ -51,9 +50,9 @@ PRODUCT_PACKAGES += \
# Prebuilt APKs/JARs from 'proprietary/priv-app'
PRODUCT_PACKAGES += \
AppDirectedSMSService \
CarrierEntitlement \
CNEService \
ConnMetrics \
ConnMO \
DCMO \
DiagMon \
......@@ -66,12 +65,10 @@ PRODUCT_PACKAGES += \
SprintHM \
VZWAPNService \
VZWAVS \
VzwLcSilent \
VzwOmaTrigger
PRODUCT_PACKAGES += \
libdmengine.so \
libdmjavaplugin.so \
libmotricity.so \
libimscamera_jni_64.so \
libimsmedia_jni_64.so
\ No newline at end of file
libimsmedia_jni_64.so
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment