Re-generate .mk files after JNI generator changes.

BUG: 16870075
Change-Id: I7d1971f2862fa27ae4469519a81029f85eab38bb

GypAndroid.darwin-arm.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-arm.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-arm.mk
 include $(LOCAL_PATH)/base/base_static.target.darwin-arm.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.darwin-arm.mk
 include $(LOCAL_PATH)/cc/cc.target.darwin-arm.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.darwin-arm.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-arm.mk

GypAndroid.darwin-arm64.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-arm64.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-arm64.mk
 include $(LOCAL_PATH)/base/base_static.target.darwin-arm64.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-arm64.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.darwin-arm64.mk
 include $(LOCAL_PATH)/cc/cc.target.darwin-arm64.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.darwin-arm64.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-arm64.mk

GypAndroid.darwin-mips.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/base_static.target.darwin-mips.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-mips.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.darwin-mips.mk
 include $(LOCAL_PATH)/cc/cc.target.darwin-mips.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.darwin-mips.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-mips.mk

GypAndroid.darwin-x86.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-x86.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-x86.mk
 include $(LOCAL_PATH)/base/base_static.target.darwin-x86.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.darwin-x86.mk
 include $(LOCAL_PATH)/cc/cc.target.darwin-x86.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.darwin-x86.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-x86.mk

GypAndroid.darwin-x86_64.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/base/base_prefs.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/base/base_static.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.darwin-x86_64.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/cc/cc.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.darwin-x86_64.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.darwin-x86_64.mk

GypAndroid.linux-arm.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.linux-arm.mk
 include $(LOCAL_PATH)/base/base_prefs.target.linux-arm.mk
 include $(LOCAL_PATH)/base/base_static.target.linux-arm.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.linux-arm.mk
 include $(LOCAL_PATH)/cc/cc.target.linux-arm.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.linux-arm.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.linux-arm.mk

GypAndroid.linux-arm64.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.linux-arm64.mk
 include $(LOCAL_PATH)/base/base_prefs.target.linux-arm64.mk
 include $(LOCAL_PATH)/base/base_static.target.linux-arm64.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-arm64.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.linux-arm64.mk
 include $(LOCAL_PATH)/cc/cc.target.linux-arm64.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.linux-arm64.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.linux-arm64.mk

GypAndroid.linux-mips.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.linux-mips.mk
 include $(LOCAL_PATH)/base/base_prefs.target.linux-mips.mk
 include $(LOCAL_PATH)/base/base_static.target.linux-mips.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-mips.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.linux-mips.mk
 include $(LOCAL_PATH)/cc/cc.target.linux-mips.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.linux-mips.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.linux-mips.mk

GypAndroid.linux-x86.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.linux-x86.mk
 include $(LOCAL_PATH)/base/base_prefs.target.linux-x86.mk
 include $(LOCAL_PATH)/base/base_static.target.linux-x86.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.linux-x86.mk
 include $(LOCAL_PATH)/cc/cc.target.linux-x86.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.linux-x86.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.linux-x86.mk

GypAndroid.linux-x86_64.mk

@@ -25,6 +25,7 @@ include $(LOCAL_PATH)/base/base_jni_headers.target.linux-x86_64.mk
 include $(LOCAL_PATH)/base/base_prefs.target.linux-x86_64.mk
 include $(LOCAL_PATH)/base/base_static.target.linux-x86_64.mk
 include $(LOCAL_PATH)/base/third_party/dynamic_annotations/dynamic_annotations.target.linux-x86_64.mk
+include $(LOCAL_PATH)/build/android/android_exports.target.linux-x86_64.mk
 include $(LOCAL_PATH)/cc/cc.target.linux-x86_64.mk
 include $(LOCAL_PATH)/cc/cc_surfaces.target.linux-x86_64.mk
 include $(LOCAL_PATH)/components/auto_login_parser.target.linux-x86_64.mk

android_webview/libwebviewchromium.target.darwin-arm.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -614,6 +615,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-Wl,-z,relro \
 	-Wl,-z,now \
 	-fuse-ld=gold \
@@ -632,6 +634,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-Wl,-z,relro \
 	-Wl,-z,now \
 	-fuse-ld=gold \

android_webview/libwebviewchromium.target.darwin-arm64.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -574,6 +575,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,-shared,-Bsymbolic \
@@ -588,6 +590,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,-shared,-Bsymbolic \

android_webview/libwebviewchromium.target.darwin-mips.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -584,6 +585,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
@@ -600,6 +602,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \

android_webview/libwebviewchromium.target.darwin-x86.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -599,6 +600,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m32 \
 	-fuse-ld=gold \
 	-nostdlib \
@@ -615,6 +617,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m32 \
 	-fuse-ld=gold \
 	-nostdlib \

android_webview/libwebviewchromium.target.darwin-x86_64.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -597,6 +598,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m64 \
 	-fuse-ld=gold \
 	-nostdlib \
@@ -613,6 +615,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m64 \
 	-fuse-ld=gold \
 	-nostdlib \

android_webview/libwebviewchromium.target.linux-arm.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -614,6 +615,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-Wl,-z,relro \
 	-Wl,-z,now \
 	-fuse-ld=gold \
@@ -632,6 +634,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-Wl,-z,relro \
 	-Wl,-z,now \
 	-fuse-ld=gold \

android_webview/libwebviewchromium.target.linux-arm64.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -574,6 +575,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,-shared,-Bsymbolic \
@@ -588,6 +590,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-nostdlib \
 	-Wl,--no-undefined \
 	-Wl,-shared,-Bsymbolic \

android_webview/libwebviewchromium.target.linux-mips.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -584,6 +585,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \
@@ -600,6 +602,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-EL \
 	-Wl,--no-keep-memory \
 	-nostdlib \

android_webview/libwebviewchromium.target.linux-x86.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -599,6 +600,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m32 \
 	-fuse-ld=gold \
 	-nostdlib \
@@ -615,6 +617,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m32 \
 	-fuse-ld=gold \
 	-nostdlib \

android_webview/libwebviewchromium.target.linux-x86_64.mk

@@ -38,6 +38,7 @@ GYP_TARGET_DEPENDENCIES := \
 	$(call intermediates-dir-for,GYP,testing_gtest_prod_gyp,,,$(GYP_VAR_PREFIX))/gtest_prod.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_modp_b64_modp_b64_gyp,,,$(GYP_VAR_PREFIX))/third_party_modp_b64_modp_b64_gyp.a \
 	$(call intermediates-dir-for,GYP,base_base_jni_headers_gyp,,,$(GYP_VAR_PREFIX))/base_jni_headers.stamp \
+	$(call intermediates-dir-for,GYP,build_android_android_exports_gyp,,,$(GYP_VAR_PREFIX))/android_exports.stamp \
 	$(call intermediates-dir-for,GYP,third_party_ashmem_ashmem_gyp,,,$(GYP_VAR_PREFIX))/ashmem.stamp \
 	$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libevent_libevent_gyp,,,$(GYP_VAR_PREFIX))/third_party_libevent_libevent_gyp.a \
 	$(call intermediates-dir-for,GYP,gpu_gpu_gyp,,,$(GYP_VAR_PREFIX))/gpu.stamp \
@@ -597,6 +598,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m64 \
 	-fuse-ld=gold \
 	-nostdlib \
@@ -613,6 +615,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,-z,noexecstack \
 	-fPIC \
 	-Wl,--no-fatal-warnings \
+	-Wl,--version-script=$(gyp_shared_intermediate_dir)/android_exports.lst \
 	-m64 \
 	-fuse-ld=gold \
 	-nostdlib \