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

Unified Diff: content/content_tests.gypi

Issue 23717023: Android: Add chrome-specific dynamic linker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to fix build. Created 7 years, 3 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
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ae647f11a208582c05dc47a78606e69fcd32fa0c..329a90b068fce9d4bd79a0be4bc79af01ae99038 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -788,6 +788,37 @@
}],
],
},
+ {
+ 'target_name': 'content_android_linker_unittests',
+ 'type': '<(gtest_target_type)',
+ 'defines!': ['CONTENT_IMPLEMENTATION'],
+ 'dependencies': [
+ 'content_browser',
+ 'content_common',
+ 'test_support_content',
+ '../base/base.gyp:test_support_base',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'test/run_all_unittests.cc',
+ ],
+ 'conditions': [
+ ['OS=="android"', {
+ 'sources': [
+ 'test/content_android_linker_unittest.cc',
+ ],
+ }],
+ ['OS == "android" and gtest_target_type == "shared_library"', {
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
+ }
],
'conditions': [
['OS!="ios"', {
@@ -1265,6 +1296,19 @@
'includes': [ '../build/apk_test.gypi' ],
},
{
+ 'target_name': 'content_android_linker_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'content_java',
+ 'content_android_linker_unittests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'content_android_linker_unittests',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_android_linker_unittests<(SHARED_LIB_SUFFIX)',
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
+ {
'target_name': 'content_browsertests_apk',
'type': 'none',
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698