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

Unified Diff: build/common.gypi

Issue 10332230: Run base_unittests_apk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« base/test/test_stub_android.cc ('K') | « build/android/run_tests.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 3cc9053eadf2199e170251a5942ae38cc8bb3b0a..fe5a0a62adfb8fc9ba3c6d16acb3bfa5fa6c8886 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -903,7 +903,7 @@
'notifications%': 0,
'gtest_target_type%': '<(gtest_target_type)',
- # TODO(jrg): when 'gtest_target_type'=='shared_libary' and
+ # TODO(jrg): when 'gtest_target_type'=='shared_library' and
# OS==android, make all gtest_targets depend on
# testing/android/native_test.gyp:native_test_apk.
### 'gtest_target_type': 'shared_libary',
@@ -1344,6 +1344,9 @@
['enable_metro==1', {
'defines': ['ENABLE_METRO=1'],
}],
+ ['OS=="android" and gtest_target_type=="shared_library"', {
+ 'defines': ['ANDROID_APK_TEST_TARGET=1'],
+ }],
['fastbuild!=0', {
'conditions': [
« base/test/test_stub_android.cc ('K') | « build/android/run_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698