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

fixed libshim_vtmal linker 

Change-Id: Ifb35c469ed58433fe109513031ee337bc5dedc72
parent 81da2216

config/common.mk

+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ PRODUCT_PACKAGES += \ 
    libmtkshim_audio \

    libmtkshim_ui \

    libmtkshim_omx \

    libmtkshim_gps

    libmtkshim_gps \

	libmtkshim_vtmal \

	libmtkshim_program_binary_builder



# Display

PRODUCT_PACKAGES += \

config/symbols.mk

+4 −1
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 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

endif

ifeq ($(TARGET_INCLUDE_VTMAL_SYMBOLS),true)

LINKER_FORCED_SHIM_LIBS := $(LINKER_FORCED_SHIM_LIBS):/system/vendor/lib/vtmal.so|libmtkshim_vtmal.so

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

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

libmtkshims/Android.mk

+25 −17
Original line number Diff line number Diff line
@@ -3,93 +3,101 @@ LOCAL_PATH := $(call my-dir) 
# mtk log symbols (xlog)

ifeq ($(TARGET_INCLUDE_XLOG_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := xlog.c

    LOCAL_SHARED_LIBRARIES := liblog

    LOCAL_MODULE := libmtkshim_log

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



# audio symbols

ifeq ($(TARGET_INCLUDE_AUDIO_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := audio.cpp

    LOCAL_MODULE := libmtkshim_audio

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



# ui symbols

ifeq ($(TARGET_INCLUDE_UI_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := ui.cpp

    LOCAL_SHARED_LIBRARIES := libui

    LOCAL_MODULE := libmtkshim_ui

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



# gui symbols

ifeq ($(TARGET_INCLUDE_GUI_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := gui.cpp

    LOCAL_SHARED_LIBRARIES := libgui

    LOCAL_MODULE := libmtkshim_gui

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



# omx symbols

ifeq ($(TARGET_INCLUDE_OMX_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := omx.cpp

    LOCAL_MODULE := libmtkshim_omx

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



# gps symbols

ifeq ($(TARGET_INCLUDE_GPS_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := \

        agps/icu53.c \

        agps/ssl.c



    LOCAL_SHARED_LIBRARIES := libicuuc libssl

    LOCAL_MODULE := libmtkshim_gps

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif



ifeq ($(TARGET_INCLUDE_VTMAL_SYMBOLS),true)

    include $(CLEAR_VARS)



    LOCAL_SRC_FILES := vtmal.cpp

    LOCAL_MODULE := libmtkshim_vtmal

    LOCAL_PROPRIETARY_MODULE := true

    include $(BUILD_SHARED_LIBRARY)

endif



ifeq ($(TARGET_INCLUDE_PBBUILDER_SYMBOLS),true)

  include $(CLEAR_VARS)

  LOCAL_SRC_FILES := pbbuilder.cpp

  LOCAL_MODULE := libmtkshim_program_binary_builder

  LOCAL_PROPRIETARY_MODULE := true

  include $(BUILD_SHARED_LIBRARY)

endif



ifeq ($(TARGET_INCLUDE_CAMERA_SYMBOLS),true)

ifeq ($(TARGET_INCLUDE_PARCEL_SYMBOLS),true)

  include $(CLEAR_VARS)

  LOCAL_SRC_FILES := parcel.cpp

  LOCAL_MODULE := libmtkshim_parcel

  LOCAL_PROPRIETARY_MODULE := true

  include $(BUILD_SHARED_LIBRARY)

endif



ifeq ($(TARGET_INCLUDE_FENCE_SYMBOLS),true)

  include $(CLEAR_VARS)

  LOCAL_SRC_FILES := fence.cpp

  LOCAL_MODULE := libmtkshim_fence

  LOCAL_PROPRIETARY_MODULE := true

  include $(BUILD_SHARED_LIBRARY)

endif



ifeq ($(TARGET_INCLUDE_CAMERA_SYMBOLS),true)

    include $(CLEAR_VARS)

    LOCAL_SRC_FILES := camera.cpp

    LOCAL_SHARED_LIBRARIES := libdpframework

    LOCAL_MODULE := libmtkshim_camera

    LOCAL_PROPRIETARY_MODULE := true



    include $(BUILD_SHARED_LIBRARY)

endif

libmtkshims/asc.cpp

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#include <stdint.h>



extern "C" {

    void _ZN7android14SurfaceControl8setLayerEj(uint32_t);



    void _ZN7android14SurfaceControl8setLayerEi(int32_t layer){

        _ZN7android14SurfaceControl8setLayerEj(static_cast<uint32_t>(layer));

    }

}
 
 No newline at end of file

libmtkshims/audioCompat.c

0 → 100644
+4 −0
Original line number Diff line number Diff line 
int get_capture_position(void)

{

    return 0;

}