diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk')
| -rw-r--r-- | android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk index ed8283a6be..a3db90fb32 100644 --- a/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk +++ b/android_webview/native/input_stream_android_jar_jni_headers.target.linux-mips.mk @@ -20,7 +20,7 @@ $(gyp_shared_intermediate_dir)/android_webview/jni/InputStream_jni.h: gyp_shared $(gyp_shared_intermediate_dir)/android_webview/jni/InputStream_jni.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH)) $(gyp_shared_intermediate_dir)/android_webview/jni/InputStream_jni.h: $(LOCAL_PATH)/base/android/jni_generator/jni_generator.py $(PWD)/prebuilts/sdk/18/android.jar $(GYP_TARGET_DEPENDENCIES) @echo "Gyp action: Generating JNI bindings from $(PWD)/prebuilts/sdk/18/android.jar/java/io/InputStream.class ($@)" - $(hide)cd $(gyp_local_path)/android_webview/native; mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; ../../base/android/jni_generator/jni_generator.py -j "$(PWD)/prebuilts/sdk/18/android.jar" --input_file java/io/InputStream.class --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --optimize_generation 0 + $(hide)cd $(gyp_local_path)/android_webview/native; mkdir -p $(gyp_shared_intermediate_dir)/android_webview/jni; ../../base/android/jni_generator/jni_generator.py -j "$(PWD)/prebuilts/sdk/18/android.jar" --input_file java/io/InputStream.class --output_dir "$(gyp_shared_intermediate_dir)/android_webview/jni" --includes base/android/jni_generator/jni_generator_helper.h --optimize_generation 0 @@ -64,14 +64,15 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Os \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections + -ffunction-sections \ + -funwind-tables MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -82,7 +83,6 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -114,7 +114,6 @@ LOCAL_CPPFLAGS_Debug := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-uninitialized \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo @@ -145,14 +144,15 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Os \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer + -fomit-frame-pointer \ + -funwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -163,7 +163,6 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -196,7 +195,6 @@ LOCAL_CPPFLAGS_Release := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-uninitialized \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo |