Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: I214d22a2830885bb316d92ce9f6394ae1b700383
diff --git a/gen_asm_offsets_vp8.target.darwin-arm.mk b/gen_asm_offsets_vp8.target.darwin-arm.mk
index deed221..eef6a3a 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -132,10 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -230,10 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -259,6 +254,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.darwin-arm64.mk b/gen_asm_offsets_vp8.target.darwin-arm64.mk
index 6fc2e86..d8beb1e 100644
--- a/gen_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-arm64.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -121,10 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -207,10 +205,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -235,6 +230,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.darwin-x86.mk b/gen_asm_offsets_vp8.target.darwin-x86.mk
index 5d07521..6e88377 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -127,10 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -219,10 +217,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -247,6 +242,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.darwin-x86_64.mk b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
index 96a1cc9..a4580a1 100644
--- a/gen_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -126,10 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -217,10 +215,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -245,6 +240,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.linux-arm.mk b/gen_asm_offsets_vp8.target.linux-arm.mk
index deed221..eef6a3a 100644
--- a/gen_asm_offsets_vp8.target.linux-arm.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -132,10 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -230,10 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -259,6 +254,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.linux-arm64.mk b/gen_asm_offsets_vp8.target.linux-arm64.mk
index 6fc2e86..d8beb1e 100644
--- a/gen_asm_offsets_vp8.target.linux-arm64.mk
+++ b/gen_asm_offsets_vp8.target.linux-arm64.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -121,10 +122,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -207,10 +205,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -235,6 +230,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.linux-x86.mk b/gen_asm_offsets_vp8.target.linux-x86.mk
index 5d07521..6e88377 100644
--- a/gen_asm_offsets_vp8.target.linux-x86.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -127,10 +128,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -219,10 +217,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -247,6 +242,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vp8.target.linux-x86_64.mk b/gen_asm_offsets_vp8.target.linux-x86_64.mk
index 96a1cc9..a4580a1 100644
--- a/gen_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/gen_asm_offsets_vp8.target.linux-x86_64.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vp8
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -126,10 +127,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -217,10 +215,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -245,6 +240,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
index 590d325..0018e0a 100644
--- a/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vpx_scale
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -132,10 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -230,10 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -259,6 +254,7 @@
### Rules for final target.
### 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
diff --git a/gen_asm_offsets_vpx_scale.target.linux-arm.mk b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
index 590d325..0018e0a 100644
--- a/gen_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/gen_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -7,6 +7,7 @@
LOCAL_MODULE_STEM := gen_asm_offsets_vpx_scale
LOCAL_MODULE_SUFFIX := .stamp
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))
@@ -132,10 +133,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -230,10 +228,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir) \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(gyp_shared_intermediate_dir)
# Flags passed to only C++ (and not C) files.
@@ -259,6 +254,7 @@
### Rules for final target.
### 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
diff --git a/libvpx.target.darwin-arm.mk b/libvpx.target.darwin-arm.mk
index 241db84..ebdaaa2 100644
--- a/libvpx.target.darwin-arm.mk
+++ b/libvpx.target.darwin-arm.mk
@@ -6,6 +6,7 @@
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))
@@ -873,10 +874,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -976,10 +974,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -1009,13 +1004,9 @@
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
-
-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
diff --git a/libvpx.target.darwin-arm64.mk b/libvpx.target.darwin-arm64.mk
index 38e5acc..1c57726 100644
--- a/libvpx.target.darwin-arm64.mk
+++ b/libvpx.target.darwin-arm64.mk
@@ -6,6 +6,7 @@
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))
@@ -274,10 +275,7 @@
$(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.
@@ -367,10 +365,7 @@
$(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.
@@ -393,13 +388,9 @@
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
diff --git a/libvpx.target.darwin-mips.mk b/libvpx.target.darwin-mips.mk
index 29357ee..6ed52e1 100644
--- a/libvpx.target.darwin-mips.mk
+++ b/libvpx.target.darwin-mips.mk
@@ -6,6 +6,7 @@
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))
@@ -242,10 +243,7 @@
$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
$(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 \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder
# Flags passed to only C++ (and not C) files.
@@ -339,10 +337,7 @@
$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
$(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 \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder
# Flags passed to only C++ (and not C) files.
@@ -366,13 +361,9 @@
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
diff --git a/libvpx.target.darwin-x86.mk b/libvpx.target.darwin-x86.mk
index 2044d82..6acd8e1 100644
--- a/libvpx.target.darwin-x86.mk
+++ b/libvpx.target.darwin-x86.mk
@@ -6,6 +6,7 @@
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_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_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_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
diff --git a/libvpx.target.darwin-x86_64.mk b/libvpx.target.darwin-x86_64.mk
index 7b0c4bb..e5a7cd1 100644
--- a/libvpx.target.darwin-x86_64.mk
+++ b/libvpx.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
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))
@@ -867,10 +868,7 @@
$(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.
@@ -965,10 +963,7 @@
$(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.
@@ -991,13 +986,9 @@
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
diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk
index 241db84..ebdaaa2 100644
--- a/libvpx.target.linux-arm.mk
+++ b/libvpx.target.linux-arm.mk
@@ -6,6 +6,7 @@
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))
@@ -873,10 +874,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -976,10 +974,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -1009,13 +1004,9 @@
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
-
-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
diff --git a/libvpx.target.linux-arm64.mk b/libvpx.target.linux-arm64.mk
index 38e5acc..1c57726 100644
--- a/libvpx.target.linux-arm64.mk
+++ b/libvpx.target.linux-arm64.mk
@@ -6,6 +6,7 @@
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))
@@ -274,10 +275,7 @@
$(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.
@@ -367,10 +365,7 @@
$(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.
@@ -393,13 +388,9 @@
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
diff --git a/libvpx.target.linux-mips.mk b/libvpx.target.linux-mips.mk
index 29357ee..6ed52e1 100644
--- a/libvpx.target.linux-mips.mk
+++ b/libvpx.target.linux-mips.mk
@@ -6,6 +6,7 @@
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))
@@ -242,10 +243,7 @@
$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
$(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 \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder
# Flags passed to only C++ (and not C) files.
@@ -339,10 +337,7 @@
$(LOCAL_PATH)/third_party/libvpx/source/libvpx \
$(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 \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx/vp8/encoder
# Flags passed to only C++ (and not C) files.
@@ -366,13 +361,9 @@
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
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 := 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_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_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_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
diff --git a/libvpx.target.linux-x86_64.mk b/libvpx.target.linux-x86_64.mk
index 7b0c4bb..e5a7cd1 100644
--- a/libvpx.target.linux-x86_64.mk
+++ b/libvpx.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
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))
@@ -867,10 +868,7 @@
$(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.
@@ -965,10 +963,7 @@
$(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.
@@ -991,13 +986,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
index 88379f5..7be9e2b 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -105,10 +106,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -206,10 +204,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -233,13 +228,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
index cc21851..d8e0170 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-arm64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -94,10 +95,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -183,10 +181,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -209,13 +204,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86.mk b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
index ca5a7ca..cdd8910 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -100,10 +101,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
index e63a58b..d814832 100644
--- a/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -99,10 +100,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -193,10 +191,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -219,13 +214,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm.mk b/libvpx_asm_offsets_vp8.target.linux-arm.mk
index 88379f5..7be9e2b 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -105,10 +106,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -206,10 +204,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -233,13 +228,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.linux-arm64.mk b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
index cc21851..d8e0170 100644
--- a/libvpx_asm_offsets_vp8.target.linux-arm64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-arm64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -94,10 +95,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -183,10 +181,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -209,13 +204,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86.mk b/libvpx_asm_offsets_vp8.target.linux-x86.mk
index ca5a7ca..cdd8910 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -100,10 +101,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
index e63a58b..d814832 100644
--- a/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
+++ b/libvpx_asm_offsets_vp8.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vp8
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))
@@ -99,10 +100,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -193,10 +191,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -219,13 +214,9 @@
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
diff --git a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
index 95dd87c..92aeac9 100644
--- a/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.darwin-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vpx_scale
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))
@@ -105,10 +106,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -206,10 +204,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -233,13 +228,9 @@
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
diff --git a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
index 95dd87c..92aeac9 100644
--- a/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
+++ b/libvpx_asm_offsets_vpx_scale.target.linux-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := libvpx_asm_offsets_vpx_scale
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))
@@ -105,10 +106,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -206,10 +204,7 @@
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
$(LOCAL_PATH)/third_party/libvpx/source/config \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -233,13 +228,9 @@
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
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86.mk b/libvpx_intrinsics_mmx.target.darwin-x86.mk
index 38b47b6..7eaa580 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_mmx_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))
@@ -102,10 +103,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -197,10 +195,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -223,13 +218,9 @@
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
diff --git a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
index e78500e..8f63910 100644
--- a/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_mmx_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))
@@ -101,10 +102,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_intrinsics_mmx.target.linux-x86.mk b/libvpx_intrinsics_mmx.target.linux-x86.mk
index 38b47b6..7eaa580 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_mmx_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))
@@ -102,10 +103,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -197,10 +195,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -223,13 +218,9 @@
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
diff --git a/libvpx_intrinsics_mmx.target.linux-x86_64.mk b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
index e78500e..8f63910 100644
--- a/libvpx_intrinsics_mmx.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_mmx.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_mmx_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))
@@ -101,10 +102,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_intrinsics_neon.target.darwin-arm.mk b/libvpx_intrinsics_neon.target.darwin-arm.mk
index c5e6884..be818e0 100644
--- a/libvpx_intrinsics_neon.target.darwin-arm.mk
+++ b/libvpx_intrinsics_neon.target.darwin-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_neon_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))
@@ -136,10 +137,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -237,10 +235,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -264,13 +259,9 @@
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
diff --git a/libvpx_intrinsics_neon.target.linux-arm.mk b/libvpx_intrinsics_neon.target.linux-arm.mk
index c5e6884..be818e0 100644
--- a/libvpx_intrinsics_neon.target.linux-arm.mk
+++ b/libvpx_intrinsics_neon.target.linux-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_neon_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))
@@ -136,10 +137,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -237,10 +235,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -264,13 +259,9 @@
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
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86.mk b/libvpx_intrinsics_sse2.target.darwin-x86.mk
index 31c55ef..0bb4b77 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse2_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))
@@ -110,10 +111,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -205,10 +203,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -231,13 +226,9 @@
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
diff --git a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
index f24a07d..c299109 100644
--- a/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse2_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))
@@ -109,10 +110,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -203,10 +201,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -229,13 +224,9 @@
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
diff --git a/libvpx_intrinsics_sse2.target.linux-x86.mk b/libvpx_intrinsics_sse2.target.linux-x86.mk
index 31c55ef..0bb4b77 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse2_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))
@@ -110,10 +111,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -205,10 +203,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -231,13 +226,9 @@
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
diff --git a/libvpx_intrinsics_sse2.target.linux-x86_64.mk b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
index f24a07d..c299109 100644
--- a/libvpx_intrinsics_sse2.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse2.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse2_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))
@@ -109,10 +110,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -203,10 +201,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -229,13 +224,9 @@
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
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
index fed5d74..3b49c7d 100644
--- a/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_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))
@@ -100,10 +101,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
index 38e954a..ff39e86 100644
--- a/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_sse4_1.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_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))
@@ -99,10 +100,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -193,10 +191,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -219,13 +214,9 @@
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
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86.mk b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
index fed5d74..3b49c7d 100644
--- a/libvpx_intrinsics_sse4_1.target.linux-x86.mk
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_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))
@@ -100,10 +101,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -195,10 +193,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -221,13 +216,9 @@
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
diff --git a/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
index 38e954a..ff39e86 100644
--- a/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_sse4_1.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_sse4_1_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))
@@ -99,10 +100,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -193,10 +191,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -219,13 +214,9 @@
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
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86.mk b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
index 5a69ff5..f4bfd2f 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_ssse3_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))
@@ -103,10 +104,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -198,10 +196,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -224,13 +219,9 @@
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
diff --git a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
index 09a2259..fb3ca9c 100644
--- a/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_ssse3_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))
@@ -102,10 +103,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -196,10 +194,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -222,13 +217,9 @@
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
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86.mk b/libvpx_intrinsics_ssse3.target.linux-x86.mk
index 5a69ff5..f4bfd2f 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_ssse3_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))
@@ -103,10 +104,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -198,10 +196,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/ia32 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -224,13 +219,9 @@
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
diff --git a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
index 09a2259..fb3ca9c 100644
--- a/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
+++ b/libvpx_intrinsics_ssse3.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_libvpx_libvpx_intrinsics_ssse3_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))
@@ -102,10 +103,7 @@
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -196,10 +194,7 @@
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir) \
$(LOCAL_PATH)/third_party/libvpx/source/config/linux/x64 \
- $(LOCAL_PATH)/third_party/libvpx/source/libvpx \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/libvpx/source/libvpx
# Flags passed to only C++ (and not C) files.
@@ -222,13 +217,9 @@
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
diff --git a/libvpx_obj_int_extract.host.darwin-arm.mk b/libvpx_obj_int_extract.host.darwin-arm.mk
index 37c2ef5..925f361 100644
--- a/libvpx_obj_int_extract.host.darwin-arm.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm.mk
@@ -191,8 +191,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.darwin-arm64.mk b/libvpx_obj_int_extract.host.darwin-arm64.mk
index e9a6169..7cdd746 100644
--- a/libvpx_obj_int_extract.host.darwin-arm64.mk
+++ b/libvpx_obj_int_extract.host.darwin-arm64.mk
@@ -189,8 +189,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.darwin-x86.mk b/libvpx_obj_int_extract.host.darwin-x86.mk
index a55cfa1..8cfd983 100644
--- a/libvpx_obj_int_extract.host.darwin-x86.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86.mk
@@ -191,8 +191,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.darwin-x86_64.mk b/libvpx_obj_int_extract.host.darwin-x86_64.mk
index 30b1fa0..ce0c306 100644
--- a/libvpx_obj_int_extract.host.darwin-x86_64.mk
+++ b/libvpx_obj_int_extract.host.darwin-x86_64.mk
@@ -191,8 +191,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.linux-arm.mk b/libvpx_obj_int_extract.host.linux-arm.mk
index 5403363..ddc98f6 100644
--- a/libvpx_obj_int_extract.host.linux-arm.mk
+++ b/libvpx_obj_int_extract.host.linux-arm.mk
@@ -195,8 +195,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.linux-arm64.mk b/libvpx_obj_int_extract.host.linux-arm64.mk
index 9365c36..36a0e08 100644
--- a/libvpx_obj_int_extract.host.linux-arm64.mk
+++ b/libvpx_obj_int_extract.host.linux-arm64.mk
@@ -193,8 +193,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.linux-x86.mk b/libvpx_obj_int_extract.host.linux-x86.mk
index 5378961..0a42828 100644
--- a/libvpx_obj_int_extract.host.linux-x86.mk
+++ b/libvpx_obj_int_extract.host.linux-x86.mk
@@ -195,8 +195,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
diff --git a/libvpx_obj_int_extract.host.linux-x86_64.mk b/libvpx_obj_int_extract.host.linux-x86_64.mk
index bb9728a..23469ed 100644
--- a/libvpx_obj_int_extract.host.linux-x86_64.mk
+++ b/libvpx_obj_int_extract.host.linux-x86_64.mk
@@ -195,8 +195,9 @@
-pthread \
-fPIC
+LOCAL_GYP_LIBS :=
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) $(LOCAL_GYP_LIBS)
### Set directly by aosp_build_settings.
LOCAL_CLANG := true
