diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 00:48:50 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 00:48:50 +0000 |
| commit | 7b56f187c5553a38ceb4741ed8daa05a179034aa (patch) | |
| tree | 62b988638a5615ee283ac3073f851558f2f846f6 /build/common.gypi | |
| parent | fdc9d6c51798f18a815d9b976d6b624844bd6826 (diff) | |
| download | chromium_src-7b56f187c5553a38ceb4741ed8daa05a179034aa.zip chromium_src-7b56f187c5553a38ceb4741ed8daa05a179034aa.tar.gz chromium_src-7b56f187c5553a38ceb4741ed8daa05a179034aa.tar.bz2 | |
Run base_unittests_apk on the test try bot for realz.
This will make the android_test bot red when apk tests fail.
The ANDROID_APK_TEST_TARGET flag is required while we transition from executable to APK tests.
- Executable tests need the DIR_CACHE override as the default path comes from the java side.
BUG=125059
Review URL: https://chromiumcodereview.appspot.com/10332230
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 73a7202..0bc48a5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -901,7 +901,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', @@ -1349,6 +1349,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': [ |