diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-08 01:54:34 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-08 01:54:34 +0000 |
| commit | 1b1d165d74a51789ceb46e6a1eafb9816636164d (patch) | |
| tree | 9042d2a9c42b1f1ed9af080533628188576a74eb /dl/openmax_dl_armv7.target.linux-arm.mk | |
| parent | c2daf13647f61d8561577485b0353c0418764dc3 (diff) | |
| download | openmax_dl-1b1d165d74a51789ceb46e6a1eafb9816636164d.tar.gz | |
Update makefiles after merge of Chromium at f4c49cc6c180
This commit was generated by merge_from_chromium.py.
Change-Id: Idd0f3c2a8e707c1385be80ac9b67da7770747801
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 99244c6..ce2eed7 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -22,7 +22,6 @@ LOCAL_GENERATED_SOURCES := GYP_COPIED_SOURCE_ORIGIN_DIRS := LOCAL_SRC_FILES := \ - third_party/openmax_dl/dl/sp/src/arm/detect.c \ third_party/openmax_dl/dl/sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix2_fs_unsafe_s.S \ third_party/openmax_dl/dl/sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix4_fs_unsafe_s.S \ third_party/openmax_dl/dl/sp/src/arm/armv7/armSP_FFT_CToC_FC32_Radix4_unsafe_s.S \ @@ -31,7 +30,8 @@ LOCAL_SRC_FILES := \ third_party/openmax_dl/dl/sp/src/arm/armv7/omxSP_FFTFwd_CToC_FC32_Sfs_s.S \ third_party/openmax_dl/dl/sp/src/arm/armv7/armSP_FFTInv_CCSToR_F32_preTwiddleRadix2_unsafe_s.S \ third_party/openmax_dl/dl/sp/src/arm/armv7/omxSP_FFTFwd_RToCCS_F32_Sfs_s.S \ - third_party/openmax_dl/dl/sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S + third_party/openmax_dl/dl/sp/src/arm/armv7/omxSP_FFTInv_CCSToR_F32_Sfs_s.S \ + third_party/openmax_dl/dl/sp/src/arm/detect.c # Flags passed to both C and C++ files. @@ -83,6 +83,7 @@ MY_DEFS_Debug := \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ + '-DDL_ARM_NEON_OPTIONAL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -111,8 +112,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -182,6 +183,7 @@ MY_DEFS_Release := \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ + '-DDL_ARM_NEON_OPTIONAL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ @@ -210,8 +212,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/openmax_dl \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |