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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 278443003: Android: cleanup gtest_target_type conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 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
« no previous file with comments | « cc/cc_tests.gyp ('k') | components/components_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 892d5d88fa78b581a865950960c53e2074c545be..5fad0d110c353b39bb9166001f03eaa8a91381ff 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2601,12 +2601,8 @@
['exclude', '^utility/importer/'],
['exclude', '^utility/media_galleries/'],
],
- 'conditions': [
- ['gtest_target_type == "shared_library"', {
- 'dependencies': [
- '../testing/android/native_test.gyp:native_test_native_code',
- ],
- }],
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
],
}], # OS == android
['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', {
@@ -2781,9 +2777,7 @@
],
'conditions': [
- # Special target to wrap a gtest_target_type==shared_library
- # unit_tests into an android apk for execution.
- ['OS == "android" and gtest_target_type == "shared_library"', {
+ ['OS == "android"', {
'targets': [
{
'target_name': 'unit_tests_java',
« no previous file with comments | « cc/cc_tests.gyp ('k') | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698