| Index: device/nfc/nfc.gyp
|
| diff --git a/device/nfc/nfc.gyp b/device/nfc/nfc.gyp
|
| index 2bc95b8bb3729fd10025ab61cfb69e3a2ff6804c..b9dc6d0ef023630a5e4b21fa1b43cf0ed856b29c 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': [
|
| {
|
| @@ -74,23 +76,26 @@
|
| 'nfc.mojom',
|
| ],
|
| },
|
| - {
|
| - # GN version: //device/nfc_mojo
|
| - 'target_name': 'device_nfc_mojo',
|
| - 'type': '<(component)',
|
| - 'dependencies': [
|
| - '../../base/base.gyp:base',
|
| - '../../mojo/mojo_edk.gyp:mojo_system_impl',
|
| - '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| - 'device_nfc_mojo_bindings',
|
| - ],
|
| - 'defines': [
|
| - 'DEVICE_NFC_IMPLEMENTATION',
|
| - ],
|
| - 'sources': [
|
| - 'nfc_impl_default.cc',
|
| - 'nfc_impl.h',
|
| + ],
|
| + '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"
|
| + }],
|
| ],
|
| }
|
|
|