diff options
Diffstat (limited to 'libvpx.target.linux-x86.mk')
| -rw-r--r-- | libvpx.target.linux-x86.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libvpx.target.linux-x86.mk b/libvpx.target.linux-x86.mk index 2044d82..6acd8e1 100644 --- a/libvpx.target.linux-x86.mk +++ b/libvpx.target.linux-x86.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libvpx_libvpx_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +LOCAL_SDK_VERSION := 19 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -802,10 +803,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/decoder \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder \ - $(gyp_shared_intermediate_dir)/third_party/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(gyp_shared_intermediate_dir)/third_party/libvpx # Flags passed to only C++ (and not C) files. @@ -901,10 +899,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/common \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/decoder \ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder \ - $(gyp_shared_intermediate_dir)/third_party/libvpx \ - $(PWD)/frameworks/wilhelm/include \ - $(PWD)/bionic \ - $(PWD)/external/stlport/stlport + $(gyp_shared_intermediate_dir)/third_party/libvpx # Flags passed to only C++ (and not C) files. @@ -927,13 +922,9 @@ LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CO LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. - -LOCAL_SHARED_LIBRARIES := \ - libstlport \ - libdl - ### Set directly by aosp_build_settings. LOCAL_CLANG := false +LOCAL_NDK_STL_VARIANT := stlport_static # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |