Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Unified Diff: testing/android/native_test.gyp

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/platform/graphics/DecodingImageGenerator.cpp ('k') | testing/android/native_test_jni_onload.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test.gyp
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 632d6871db72559bab0ef34bf9f86d5d523b51dd..7d0ebc8919301db1790613273229bd63af3150db 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -16,6 +16,13 @@
'native_test_launcher.cc',
'native_test_launcher.h',
],
+ 'direct_dependent_settings': {
+ 'ldflags!': [
+ # JNI_OnLoad is implemented in a .a and we need to
+ # re-export in the .so.
+ '-Wl,--exclude-libs=ALL',
+ ],
+ },
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
« no previous file with comments | « sky/engine/platform/graphics/DecodingImageGenerator.cpp ('k') | testing/android/native_test_jni_onload.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698