Commit 6c19acaa authored by d0n (d0n@d0nmachine)'s avatar d0n (d0n@d0nmachine)
Browse files

{'modified': ['config/board.mk', 'config/common.mk', 'config/symbols.mk',... 

{'modified': ['config/board.mk', 'config/common.mk', 'config/symbols.mk', 'libmtkshims/Android.mk', 'proprietary/hardware/ril/gsm/librilmtk/Android.mk_', 'proprietary/hardware/ril/gsm/librilmtk/RilSapSocket.cpp', 'proprietary/hardware/ril/gsm/librilmtk/include/RilSapSocket.h', 'proprietary/hardware/ril/gsm/librilmtk/include/rilSocketQueue.h', 'proprietary/hardware/ril/gsm/librilmtk/ril.cpp', 'proprietary/hardware/ril/gsm/librilmtk/ril_ims.cpp', 'proprietary/hardware/ril/gsm/mtk-ril/Android.mk_', 'proprietary/hardware/ril/gsm/rild/Android.mk_', 'proprietary/hardware/ril/gsm/rild/rild.c', 'proprietary/hardware/ril/include/RilSapSocket.h', 'proprietary/hardware/ril/include/rilSocketQueue.h', 'proprietary/hardware/ril/rilproxy/rild/radiooptions.c', 'proprietary/hardware/ril/rilproxy/rild/rild.c', 'proprietary/hardware/ril/rilproxy/rild/rild.h'], 'deleted': ['libmtkshims/rilproxy.cpp', 'proprietary/frameworks/opt/telephony/Android.mk_'], 'added': ['libmtkshims/.gui.cpp.swp', 'proprietary/frameworks/opt/telephony/Android.mk', 'proprietary/hardware/ril/gsm/librilmtk/socket_channel.cpp', 'proprietary/hardware/ril/gsm/librilmtk/socket_util.cpp', 'proprietary/hardware/ril/include/telephony/ril.h', 'proprietary/hardware/ril/include/telephony/ril_data.h', 'proprietary/hardware/ril/include/telephony/sap-api.h', 'proprietary/hardware/ril/rilproxy/libril/Android.mk_', 'proprietary/hardware/ril/rilproxy/librilutils/Android.mk_', 'proprietary/hardware/ril/rilproxy/mtk-rilproxy/Android.mk_', 'proprietary/hardware/ril/rilproxy/mtk-rilproxy/telephony/agps/tests/Android.mk_', 'proprietary/hardware/ril/rilproxy/rild/Android.mk_']} cm-14.1

Change-Id: Icc3535c5866805d5df7332197428f3133b21f13f
parent 4b6313ee

config/board.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ endif 


# SELinux

BOARD_SEPOLICY_DIRS := \

    vendor/mad/sepolicy

    vendor/mediatek/sepolicy



# DEXPREOPT

ifeq ($(TARGET_BUILD_VARIANT),user)

config/common.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ PRODUCT_PACKAGES += \ 
    libmtkshim_gps \

	libmtkshim_vtmal \

	libmtkshim_rilproxy \

	libmtkshim_program_binary_builder

	libmtkshim_pbbuilder



# Display

PRODUCT_PACKAGES += \

config/symbols.mk

+6 −3
Original line number Diff line number Diff line
@@ -12,18 +12,21 @@ ifeq ($(TARGET_INCLUDE_GUI_SYMBOLS),true) 
LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/lib/libgui.so|libmtkshim_gui.so:/system/lib64/libgui.so|libmtkshim_gui.so

endif

#ifeq ($(TARGET_INCLUDE_OMX_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libMtkOmxVdec.so|libmtkshim_omx.so

#LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libMtkOmxVdec.so|libmtkshim_omx.so

#endif

#ifeq ($(TARGET_INCLUDE_GPS_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/bin/mtk_agpsd|libmtkshim_gps.so

#endif

#ifeq ($(TARGET_INCLUDE_PBBUILDER_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/vendor/bin/program_binary_builder|libmtkshim_program_binary_builder.so

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/bin/program_binary_builder|libmtkshim_pbbuilder.so:/system/vendor/lib/libprogrambinary.so:libmtkshim_pbbuilder.so:/system/vendor/lib64/libprogrambinary.so:libmtkshim_pbbuilder.so

#endif

#ifeq ($(TARGET_INCLUDE_VTMAL_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libvtmal.so|libmtkshim_vtmal.so:/system/vendor/lib/libvtmal.so|libvt_custom.so:/system/vendor/bin/vtservice|libmtkshim_vtmal.so

#$(error $(LINKER_FORCED_SHIM_LIBS))

#endif

#ifeq ($(TARGET_INCLUDE_CAMERA_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libfeatureio.so|libmtkshim_camera.so:/system/vendor/lib64/libfeatureio.so|libmtkshim_camera.so:/system/vendor/lib/libcam.camnode.so|libmtkshim_camera.so:/system/vendor/lib64/libcam.camnode.so|libmtkshim_camera.so

#LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libfeatureio.so|libmtkshim_camera.so:/system/vendor/lib64/libfeatureio.so|libmtkshim_camera.so:/system/vendor/lib/libcam.camnode.so|libmtkshim_camera.so:/system/vendor/lib64/libcam.camnode.so|libmtkshim_camera.so

#endif

#LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/libmal_rilproxy.so|mtk-rilproxy.so:/system/vendor/lib64/libmal_rilproxy.so|mtk-rilproxy.so

libmtkshims/.gui.cpp.swp

0 → 100644
+12 KiB

File added.

No diff preview for this file type.

View file

libmtkshims/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ endif 
ifeq ($(TARGET_INCLUDE_PBBUILDER_SYMBOLS),true)

  include $(CLEAR_VARS)

  LOCAL_SRC_FILES := pbbuilder.cpp

  LOCAL_MODULE := libmtkshim_program_binary_builder

  LOCAL_MODULE := libmtkshim_pbbuilder

  LOCAL_PROPRIETARY_MODULE := true

  include $(BUILD_SHARED_LIBRARY)

endif