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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/events.gyp

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 | « third_party/leveldatabase/leveldatabase.gyp ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 83833566f1d20ce74de5c56bb17f7c61c9b2fc87..f3beac5d32fca952a6ce63aaaed1f6d11757ae75 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -321,7 +321,7 @@
'event_unittest.cc',
],
}],
- ['OS == "android" and gtest_target_type == "shared_library"', {
+ ['OS == "android"', {
'dependencies': [
'../../testing/android/native_test.gyp:native_test_native_code',
],
@@ -330,10 +330,7 @@
},
],
'conditions': [
- # Special target to wrap a gtest_target_type==shared_library
- # ui_unittests into an android apk for execution.
- # See base.gyp for TODO(jrg)s about this strategy.
- ['OS == "android" and gtest_target_type == "shared_library"', {
+ ['OS == "android"', {
'targets': [
{
'target_name': 'events_unittests_apk',
« no previous file with comments | « third_party/leveldatabase/leveldatabase.gyp ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698