diff options
Diffstat (limited to 'libyuv.target.darwin-arm.mk')
| -rw-r--r-- | libyuv.target.darwin-arm.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk index a488665..5a7e137 100644 --- a/libyuv.target.darwin-arm.mk +++ b/libyuv.target.darwin-arm.mk @@ -11,8 +11,7 @@ gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -127,7 +126,6 @@ MY_DEFS_Debug := \ '-DVIDEO_HOLE=1' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -145,7 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -235,7 +233,6 @@ MY_DEFS_Release := \ '-DVIDEO_HOLE=1' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -253,7 +250,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |