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

Unified Diff: device/nfc/nfc.gyp

Issue 1486043002: [webnfc] Implement push method for Android nfc mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@step_6_add_mojo_service_CL
Patch Set: Rebased. Created 4 years, 8 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
Index: device/nfc/nfc.gyp
diff --git a/device/nfc/nfc.gyp b/device/nfc/nfc.gyp
index 2ce85752883a528467a226d7f0d4626633e7fb1a..d35924e719201fb51b03291a94eb765037666b6c 100644
--- a/device/nfc/nfc.gyp
+++ b/device/nfc/nfc.gyp
@@ -5,6 +5,8 @@
{
'variables': {
'chromium_code': 1,
+ 'android_support_v13_target%':
+ '../../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
},
'targets': [
{
@@ -92,6 +94,37 @@
'nfc_impl_default.cc',
'nfc_impl.h',
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ 'device_nfc_java',
+ ],
+ 'sources!': [
+ 'nfc_impl_default.cc',
+ ],
+ }],
+ ],
},
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'targets': [
+ {
+ 'target_name': 'device_nfc_java',
+ 'type': 'none',
+ 'dependencies': [
+ '<(android_support_v13_target)',
+ '../../base/base.gyp:base',
+ '../../mojo/mojo_public.gyp:mojo_bindings_java',
+ 'device_nfc_mojo_bindings',
+ ],
+ 'variables': {
+ 'java_in_dir': '../../device/nfc/android/java',
+ },
+ 'includes': [ '../../build/java.gypi' ],
+ },
+ ],
+ }, { # OS != "android"
+ }],
+ ],
}

Powered by Google App Engine
This is Rietveld 408576698