Build separate sonivox libs with and without jet

and remove more unused code.

Bug: 151448144
Test: build

Change-Id: I6c5ef52c3fe3a00d1bd578005a77a07016540297

Author: marcone

arm-wt-22k/Android.bp

@@ -1,5 +1,5 @@
-cc_library {
-    name: "libsonivox",
+cc_defaults {
+    name: "libsonivox-defaults",
     srcs: [
         "lib_src/eas_data.c",
         "lib_src/eas_dlssynth.c",
@@ -30,7 +30,6 @@ cc_library {
         "lib_src/eas_xmf.c",
         "lib_src/eas_xmfdata.c",
         "lib_src/wt_22khz.c",
-        "lib_src/jet.c",
         "host_src/eas_config.c",
         "host_src/eas_hostmm.c",
         "host_src/eas_report.c",
@@ -114,3 +113,23 @@ cc_library {
         ],
     }
 }
+
+cc_library {
+    name: "libsonivoxwithoutjet",
+    defaults: ["libsonivox-defaults"],
+    apex_available: ["com.android.media"],
+}
+
+cc_library {
+    name: "libsonivox",
+    defaults: ["libsonivox-defaults"],
+    srcs: [
+        "lib_src/jet.c",
+    ],
+
+    cflags: [
+        "-DJET_INTERFACE",
+    ],
+}
+
+

arm-wt-22k/lib_src/eas_data.h

@@ -31,8 +31,6 @@
 #ifndef _EAS_DATA_H
 #define _EAS_DATA_H
 
-#define JET_INTERFACE
-
 #include "eas_types.h"
 #include "eas_synthcfg.h"
 #include "eas.h"

arm-wt-22k/lib_src/eas_imelody.c

@@ -160,8 +160,13 @@ const S_FILE_PARSER_INTERFACE EAS_iMelody_Parser =
     IMY_State,
     IMY_Close,
     IMY_Reset,
+#ifdef JET_INTERFACE
     IMY_Pause,
     IMY_Resume,
+#else
+    NULL,
+    NULL,
+#endif
     NULL,
     IMY_SetData,
     IMY_GetData,
@@ -706,6 +711,7 @@ static EAS_RESULT IMY_Reset (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * IMY_Pause()
  *----------------------------------------------------------------------------
@@ -777,6 +783,7 @@ static EAS_RESULT IMY_Resume (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     pData->state = EAS_STATE_PLAY;
     return EAS_SUCCESS;
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * IMY_SetData()

arm-wt-22k/lib_src/eas_ota.c

@@ -117,8 +117,13 @@ const S_FILE_PARSER_INTERFACE EAS_OTA_Parser =
     OTA_State,
     OTA_Close,
     OTA_Reset,
+#ifdef JET_INTERFACE
     OTA_Pause,
     OTA_Resume,
+#else
+    NULL,
+    NULL,
+#endif
     NULL,
     OTA_SetData,
     OTA_GetData,
@@ -675,6 +680,7 @@ static EAS_RESULT OTA_Reset (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * OTA_Pause()
  *----------------------------------------------------------------------------
@@ -738,6 +744,7 @@ static EAS_RESULT OTA_Resume (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     pData->state = EAS_STATE_PLAY;
     return EAS_SUCCESS;
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * OTA_SetData()

arm-wt-22k/lib_src/eas_public.c

@@ -218,55 +218,6 @@ EAS_RESULT EAS_IntSetStrmParam (S_EAS_DATA *pEASData, EAS_HANDLE pStream, EAS_IN
     return EAS_SUCCESS;
 }
 
-/*----------------------------------------------------------------------------
- * EAS_IntGetStrmParam()
- *----------------------------------------------------------------------------
- * This routine gets common parameters like transpose, volume, etc.
- * First, it attempts to use the parser EAS_GetStreamParameter interface. If that
- * fails, it attempts to get the synth handle from the parser and
- * get the parameter directly on the synth.
- *----------------------------------------------------------------------------
-*/
-EAS_RESULT EAS_IntGetStrmParam (S_EAS_DATA *pEASData, EAS_HANDLE pStream, EAS_INT param, EAS_I32 *pValue)
-{
-    S_SYNTH *pSynth;
-
-    /* try to set the parameter */
-    if (EAS_GetStreamParameter(pEASData, pStream, param, pValue) == EAS_SUCCESS)
-        return EAS_SUCCESS;
-
-    /* get a pointer to the synth object and retrieve data directly */
-    /*lint -e{740} we are cheating by passing a pointer through this interface */
-    if (EAS_GetStreamParameter(pEASData, pStream, PARSER_DATA_SYNTH_HANDLE, (EAS_I32*) &pSynth) != EAS_SUCCESS)
-        return EAS_ERROR_INVALID_PARAMETER;
-
-    if (pSynth == NULL)
-        return EAS_ERROR_INVALID_PARAMETER;
-
-    switch (param)
-    {
-        case PARSER_DATA_POLYPHONY:
-            return VMGetPolyphony(pEASData->pVoiceMgr, pSynth, pValue);
-
-        case PARSER_DATA_PRIORITY:
-            return VMGetPriority(pEASData->pVoiceMgr, pSynth, pValue);
-
-        case PARSER_DATA_TRANSPOSITION:
-            VMGetTranposition(pSynth, pValue);
-            break;
-
-        case PARSER_DATA_NOTE_COUNT:
-            *pValue = VMGetNoteCount(pSynth);
-            break;
-
-        default:
-            { /* dpp: EAS_ReportEx(_EAS_SEVERITY_ERROR, "Invalid paramter %d in call to EAS_IntSetStrmParam", param); */ }
-            return EAS_ERROR_INVALID_PARAMETER;
-    }
-
-    return EAS_SUCCESS;
-}
-
 /*----------------------------------------------------------------------------
  * EAS_AllocateStream()
  *----------------------------------------------------------------------------
@@ -683,23 +634,6 @@ EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR l
     return EAS_ERROR_UNRECOGNIZED_FORMAT;
 }
 
-/*----------------------------------------------------------------------------
- * EAS_GetFileType
- *----------------------------------------------------------------------------
- * Returns the file type (see eas_types.h for enumerations)
- *----------------------------------------------------------------------------
- * pEASData         - pointer to EAS persistent data object
- * pStream          - stream handle
- * pFileType        - pointer to variable to receive file type
- *----------------------------------------------------------------------------
-*/
-EAS_PUBLIC EAS_RESULT EAS_GetFileType (S_EAS_DATA *pEASData, EAS_HANDLE pStream, EAS_I32 *pFileType)
-{
-    if (!EAS_StreamReady (pEASData, pStream))
-        return EAS_ERROR_NOT_VALID_IN_THIS_STATE;
-    return EAS_GetStreamParameter(pEASData, pStream, PARSER_DATA_FILE_TYPE, pFileType);
-}
-
 /*----------------------------------------------------------------------------
  * EAS_Prepare()
  *----------------------------------------------------------------------------
@@ -825,18 +759,21 @@ EAS_PUBLIC EAS_RESULT EAS_Render (EAS_DATA_HANDLE pEASData, EAS_PCM *pOut, EAS_I
             /* establish pointer to parser module */
             pParserModule = pEASData->streams[streamNum].pParserModule;
 
+#ifdef JET_INTERFACE
             /* handle pause */
             if (pEASData->streams[streamNum].streamFlags & STREAM_FLAGS_PAUSE)
             {
                 if (pParserModule->pfPause)
                     result = pParserModule->pfPause(pEASData, pEASData->streams[streamNum].handle);
                 pEASData->streams[streamNum].streamFlags &= ~STREAM_FLAGS_PAUSE;
             }
+#endif
 
             /* get current state */
             if ((result = (*pParserModule->pfState)(pEASData, pEASData->streams[streamNum].handle, &parserState)) != EAS_SUCCESS)
                 return result;
 
+#ifdef JET_INTERFACE
             /* handle resume */
             if (parserState == EAS_STATE_PAUSED)
             {
@@ -847,6 +784,7 @@ EAS_PUBLIC EAS_RESULT EAS_Render (EAS_DATA_HANDLE pEASData, EAS_PCM *pOut, EAS_I
                     pEASData->streams[streamNum].streamFlags &= ~STREAM_FLAGS_RESUME;
                 }
             }
+#endif
 
             /* if necessary, parse stream */
             if ((pEASData->streams[streamNum].streamFlags & STREAM_FLAGS_PARSED) == 0)
@@ -1001,6 +939,7 @@ EAS_PUBLIC EAS_RESULT EAS_Render (EAS_DATA_HANDLE pEASData, EAS_PCM *pOut, EAS_I
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * EAS_SetTransposition)
  *----------------------------------------------------------------------------
@@ -1031,6 +970,7 @@ EAS_PUBLIC EAS_RESULT EAS_SetTransposition (EAS_DATA_HANDLE pEASData, EAS_HANDLE
         return EAS_ERROR_NOT_VALID_IN_THIS_STATE;
     return EAS_IntSetStrmParam(pEASData, pStream, PARSER_DATA_TRANSPOSITION, transposition);
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * EAS_ParseEvents()
@@ -1484,6 +1424,7 @@ EAS_PUBLIC EAS_RESULT EAS_GetLocation (EAS_DATA_HANDLE pEASData, EAS_HANDLE pStr
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * EAS_Pause()
  *----------------------------------------------------------------------------
@@ -1600,6 +1541,7 @@ EAS_PUBLIC EAS_RESULT EAS_Resume (EAS_DATA_HANDLE pEASData, EAS_HANDLE pStream)
 
     return result;
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * EAS_SetParameter()

arm-wt-22k/lib_src/eas_rtttl.c

@@ -105,8 +105,13 @@ const S_FILE_PARSER_INTERFACE EAS_RTTTL_Parser =
     RTTTL_State,
     RTTTL_Close,
     RTTTL_Reset,
+#ifdef JET_INTERFACE
     RTTTL_Pause,
     RTTTL_Resume,
+#else
+    NULL,
+    NULL,
+#endif
     NULL,
     RTTTL_SetData,
     RTTTL_GetData,
@@ -626,6 +631,7 @@ static EAS_RESULT RTTTL_Reset (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * RTTTL_Pause()
  *----------------------------------------------------------------------------
@@ -689,6 +695,7 @@ static EAS_RESULT RTTTL_Resume (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     pData->state = EAS_STATE_PLAY;
     return EAS_SUCCESS;
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * RTTTL_SetData()

arm-wt-22k/lib_src/eas_smf.c

@@ -79,8 +79,13 @@ const S_FILE_PARSER_INTERFACE EAS_SMF_Parser =
     SMF_State,
     SMF_Close,
     SMF_Reset,
+#ifdef JET_INTERFACE
     SMF_Pause,
     SMF_Resume,
+#else
+    NULL,
+    NULL,
+#endif
     NULL,
     SMF_SetData,
     SMF_GetData,
@@ -528,6 +533,7 @@ EAS_RESULT SMF_Reset (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     return EAS_SUCCESS;
 }
 
+#ifdef JET_INTERFACE
 /*----------------------------------------------------------------------------
  * SMF_Pause()
  *----------------------------------------------------------------------------
@@ -591,6 +597,7 @@ EAS_RESULT SMF_Resume (S_EAS_DATA *pEASData, EAS_VOID_PTR pInstData)
     pSMFData->state = EAS_STATE_PLAY;
     return EAS_SUCCESS;
 }
+#endif
 
 /*----------------------------------------------------------------------------
  * SMF_SetData()