Update makefiles after merge of Chromium at 89b463ddd92b
This commit was generated by merge_from_chromium.py.
Change-Id: I9252b44f242eeb73b109253a8e989cde7db63ed0
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 052a6a0..eeeca01 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -130,10 +131,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -237,10 +235,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# 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/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index dbd9b03..c7ee105 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -119,10 +120,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -214,10 +212,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -240,13 +235,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/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 9bb0eab..6f119e1 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -123,10 +124,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -223,10 +221,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -250,13 +245,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/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 3768c3c..3bdcfcd 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -125,10 +126,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -226,10 +224,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -252,13 +247,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/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 7ecee4c..c95485d 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -124,10 +125,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -224,10 +222,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -250,13 +245,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/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 052a6a0..eeeca01 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -130,10 +131,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -237,10 +235,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# 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/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index dbd9b03..c7ee105 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -119,10 +120,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -214,10 +212,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -240,13 +235,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/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 9bb0eab..6f119e1 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -123,10 +124,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -223,10 +221,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -250,13 +245,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/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 3768c3c..3bdcfcd 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -125,10 +126,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -226,10 +224,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -252,13 +247,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/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 7ecee4c..c95485d 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -6,6 +6,7 @@
LOCAL_MODULE := third_party_freetype_ft2_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))
@@ -124,10 +125,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -224,10 +222,7 @@
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
$(LOCAL_PATH)/third_party/libpng \
- $(LOCAL_PATH)/third_party/zlib \
- $(PWD)/frameworks/wilhelm/include \
- $(PWD)/bionic \
- $(PWD)/external/stlport/stlport
+ $(LOCAL_PATH)/third_party/zlib
# Flags passed to only C++ (and not C) files.
@@ -250,13 +245,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
