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

Unified Diff: device/device_tests.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 | « build/all.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/device_tests.gyp
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index eb42712d469d9aa09eb1818ed8508da8e426ad0f..9bf39acdd355439f09f4fafec04ff65030b0de75 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -78,6 +78,23 @@
'battery/battery_status_manager_linux_unittest.cc',
],
}],
+ ['OS=="android"', {
+ 'dependencies!': [
+ '../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
+ 'usb/usb.gyp:device_usb',
+ 'serial/serial.gyp:device_serial',
+ 'serial/serial.gyp:device_serial_test_util',
+ 'hid/hid.gyp:device_hid',
+ ],
+ 'dependencies': [
+ '../testing/android/native_test.gyp:native_test_native_code',
+ ],
+ 'sources/': [
+ ['exclude', '(^|/)hid'],
+ ['exclude', '(^|/)serial'],
+ ['exclude', '(^|/)usb'],
+ ],
+ }],
['OS=="mac"', {
'link_settings': {
'libraries': [
@@ -123,4 +140,21 @@
],
},
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'device_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'device_unittests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'device_unittests',
+ },
+ 'includes': [ '../build/apk_test.gypi' ],
+ },
+ ],
+ }],
+ ],
}
« no previous file with comments | « build/all.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698