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

Unified Diff: build/all.gyp

Issue 1028833002: bluetooth: Enable device_unittests target on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | device/device_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 2cb463ef2aeb07c9cc19e14aa58e6b053fc9d2f7..2a8282f72be568dc702ed43883e5f7c279c36688 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -108,8 +108,6 @@
'../chrome/tools/profile_reset/jtl_compiler.gyp:*',
'../cc/blink/cc_blink_tests.gyp:*',
'../cc/cc_tests.gyp:*',
- '../device/bluetooth/bluetooth.gyp:*',
- '../device/device_tests.gyp:*',
'../device/usb/usb.gyp:*',
'../gin/gin.gyp:*',
'../gpu/gpu.gyp:*',
@@ -150,6 +148,12 @@
'<(libjpeg_gyp_path):*',
],
}],
+ ['OS!="ios"', {
+ 'dependencies': [
+ '../device/bluetooth/bluetooth.gyp:*',
+ '../device/device_tests.gyp:*',
+ ],
+ }],
['use_openssl==0 and (OS=="mac" or OS=="ios" or OS=="win")', {
'dependencies': [
'../third_party/nss/nss.gyp:*',
« no previous file with comments | « no previous file | device/device_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698