diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-20 13:39:29 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-20 13:39:29 +0000 |
| commit | 1e0c871908185f34ace0c110d3923e3bcbd846c7 (patch) | |
| tree | b230f7535922e2dee41178184c2bb53364dd4145 | |
| parent | 1aca6aca2ce52791824da4a7d1560b4da3e137f2 (diff) | |
| download | openmax_dl-1e0c871908185f34ace0c110d3923e3bcbd846c7.tar.gz | |
Update makefiles after merge of Chromium at 278699
This commit was generated by merge_from_chromium.py.
Change-Id: I24cd0e3dae9a594beadcdc75efb2659eb5a181dd
| -rw-r--r-- | dl/openmax_dl.target.darwin-arm.mk | 8 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-arm.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk index 88d2e7e..64c297c 100644 --- a/dl/openmax_dl.target.darwin-arm.mk +++ b/dl/openmax_dl.target.darwin-arm.mk @@ -26,16 +26,16 @@ LOCAL_SRC_FILES := \ third_party/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c \ third_party/openmax_dl/dl/sp/src/arm/armSP_FFT_S32TwiddleTable.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_F32.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_F32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S32.c \ diff --git a/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk index 88d2e7e..64c297c 100644 --- a/dl/openmax_dl.target.linux-arm.mk +++ b/dl/openmax_dl.target.linux-arm.mk @@ -26,16 +26,16 @@ LOCAL_SRC_FILES := \ third_party/openmax_dl/dl/sp/src/armSP_FFT_F32TwiddleTable.c \ third_party/openmax_dl/dl/sp/src/arm/armSP_FFT_S32TwiddleTable.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_FC32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_F32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_FC32.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_F32.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_C_SC16.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16.c \ + third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTGetBufSize_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_SC16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_C_SC32.c \ - third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_F32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S16.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S16S32.c \ third_party/openmax_dl/dl/sp/src/arm/omxSP_FFTInit_R_S32.c \ |