Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39a94cc3 authored by hongteng's avatar hongteng Committed by Android (Google) Code Review
Browse files

Merge "Fix for issue 3385135 "source code cleanup" engine part - remove the unused header files"

parents b035072d 2fb605a0

media/jni/mediaeditor/VideoEditorClasses.cpp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ extern "C" { 
#include <M4OSA_FileWriter.h>

#include <M4OSA_Memory.h>

#include <M4OSA_Debug.h>

#include <M4OSA_String.h>

#include <M4OSA_Thread.h>

#include <M4VSS3GPP_API.h>

#include <M4xVSS_API.h>

media/jni/mediaeditor/VideoEditorMain.cpp

+0 −3
Original line number Diff line number Diff line
@@ -41,15 +41,12 @@ extern "C" { 
#include <M4OSA_FileCommon.h>

#include <M4OSA_FileReader.h>

#include <M4OSA_FileWriter.h>

#include <M4OSA_FileExtra.h>

#include <M4OSA_Memory.h>

#include <M4OSA_String.h>

#include <M4OSA_Thread.h>

#include <M4xVSS_API.h>

#include <M4VSS3GPP_ErrorCodes.h>

#include <M4MCS_API.h>

#include <M4MCS_ErrorCodes.h>

#include <M4MDP_API.h>

#include <M4READER_Common.h>

#include <M4WRITER_common.h>

};

media/jni/mediaeditor/VideoEditorOsal.cpp

+0 −9
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ extern "C" { 
#include <M4OSA_FileReader.h>

#include <M4OSA_FileWriter.h>

#include <M4OSA_Memory.h>

#include <M4OSA_String.h>

#include <M4OSA_Thread.h>

#include <M4xVSS_API.h>

#include <M4VSS3GPP_ErrorCodes.h>
@@ -82,14 +81,6 @@ static const VideoEdit_Osal_Result gkRESULTS[] = 
    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_FILE_BAD_MODE_ACCESS                             ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_FILE_INVALID_POSITION                            ),



    // M4OSA_String.h

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_BAD_STRING                                   ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_CONV_FAILED                                  ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_OVERFLOW                                     ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_BAD_ARGS                                     ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4WAR_STR_OVERFLOW                                     ),

    VIDEOEDIT_OSAL_RESULT_INIT(M4WAR_STR_NOT_FOUND                                    ),



    // M4OSA_Thread.h

    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_THREAD_NOT_STARTED                               ),

media/jni/mediaeditor/VideoEditorPropertiesMain.cpp

+0 −2
Original line number Diff line number Diff line
@@ -34,13 +34,11 @@ extern "C" { 
#include <M4OSA_FileReader.h>

#include <M4OSA_FileWriter.h>

#include <M4OSA_Memory.h>

#include <M4OSA_String.h>

#include <M4OSA_Thread.h>

#include <M4VSS3GPP_API.h>

#include <M4VSS3GPP_ErrorCodes.h>

#include <M4MCS_API.h>

#include <M4MCS_ErrorCodes.h>

#include <M4MDP_API.h>

#include <M4READER_Common.h>

#include <M4WRITER_common.h>

#include <M4DECODER_Common.h>