Index: components/installedapp/installedapp.gyp |
diff --git a/device/vibration/vibration.gyp b/components/installedapp/installedapp.gyp |
similarity index 50% |
copy from device/vibration/vibration.gyp |
copy to components/installedapp/installedapp.gyp |
index 99d75ba9c8e50e94e1aa480deb91b2a218403ef1..ec7e8b3961f61825194fa44551f83519cc23fb01 100644 |
--- a/device/vibration/vibration.gyp |
+++ b/components/installedapp/installedapp.gyp |
@@ -8,19 +8,19 @@ |
}, |
'targets': [ |
{ |
- # GN version: //device/vibration:mojo_bindings |
- 'target_name': 'device_vibration_mojo_bindings', |
+ # GN version: //components/installedapp:installedapp_mojo |
+ 'target_name': 'components_installedapp_mojo_bindings', |
'type': 'static_library', |
'includes': [ |
'../../third_party/mojo/mojom_bindings_generator.gypi', |
], |
'sources': [ |
- 'vibration_manager.mojom', |
+ 'installed_app_provider.mojom', |
], |
}, |
{ |
- # GN version: //device/vibration |
- 'target_name': 'device_vibration', |
+ # GN version: //components/installedapp |
+ 'target_name': 'components_installedapp', |
'type': '<(component)', |
'dependencies': [ |
'../../base/base.gyp:base', |
@@ -28,42 +28,55 @@ |
'../../mojo/mojo_base.gyp:mojo_environment_chromium', |
'../../third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
'../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
- 'device_vibration_mojo_bindings', |
+ 'components_installedapp_mojo_bindings', |
], |
'defines': [ |
- 'DEVICE_VIBRATION_IMPLEMENTATION', |
+ 'COMPONENTS_INSTALLEDAPP_IMPLEMENTATION', |
], |
'sources': [ |
- 'vibration_manager_impl.h', |
- 'vibration_manager_impl_default.cc', |
+ 'installed_app_provider_impl.h', |
+ 'installed_app_provider_impl_default.cc', |
], |
'conditions': [ |
['OS == "android"', { |
'dependencies': [ |
- 'device_vibration_java', |
- ], |
- 'sources!': [ |
- 'vibration_manager_impl_default.cc', |
+ 'components_installedapp_java', |
], |
}], |
], |
}, |
], |
- 'conditions': [ |
+ 'conditions': [ |
['OS == "android"', { |
'targets': [ |
{ |
- 'target_name': 'device_vibration_java', |
+ 'target_name': 'components_installedapp_java', |
'type': 'none', |
'dependencies': [ |
'../../base/base.gyp:base', |
'../../third_party/mojo/mojo_public.gyp:mojo_bindings_java', |
- 'device_vibration_mojo_bindings', |
+ 'components_installedapp_mojo_bindings', |
], |
'variables': { |
- 'java_in_dir': '../../device/vibration/android/java', |
+ 'java_in_dir': '../../components/installedapp/android/java', |
}, |
'includes': [ '../../build/java.gypi' ], |
+ }, { |
+ 'target_name': 'installedapp_junit_tests', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'components_installedapp_java', |
+ '../../base/base.gyp:base_java', |
+ '../../base/base.gyp:base_java_test_support', |
+ '../../testing/android/junit/junit_test.gyp:junit_test_support', |
+ ], |
+ 'variables': { |
+ 'main_class': 'org.chromium.testing.local.JunitTestMain', |
+ 'src_paths': [ |
+ '../../components/installedapp/android/junit/' |
+ ], |
+ }, |
+ 'includes': [ '../../build/host_jar.gypi' ], |
}, |
], |
}], |