| Index: mojo/mojo_base.gyp
|
| diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
|
| index bab8c0ed5af6aa6d8f01959750f37af79af83f11..32f6d0aa6c86db612da4a61daa50f708e1ac2206 100644
|
| --- a/mojo/mojo_base.gyp
|
| +++ b/mojo/mojo_base.gyp
|
| @@ -25,8 +25,8 @@
|
| 'conditions': [
|
| ['OS == "android"', {
|
| 'dependencies': [
|
| - 'public/mojo_public.gyp:mojo_bindings_java',
|
| - 'public/mojo_public.gyp:mojo_public_java',
|
| + 'mojo_public.gyp:mojo_bindings_java',
|
| + 'mojo_public.gyp:mojo_public_java',
|
| ],
|
| }],
|
| ]
|
| @@ -75,13 +75,13 @@
|
| '../base/base.gyp:base_message_loop_tests',
|
| '../testing/gtest.gyp:gtest',
|
| '../url/url.gyp:url_lib',
|
| - 'edk/mojo_edk.gyp:mojo_system_impl',
|
| - 'edk/mojo_edk.gyp:mojo_common_test_support',
|
| - 'edk/mojo_edk.gyp:mojo_run_all_unittests',
|
| 'mojo_common_lib',
|
| + 'mojo_edk.gyp:mojo_system_impl',
|
| + 'mojo_edk.gyp:mojo_common_test_support',
|
| + 'mojo_edk.gyp:mojo_run_all_unittests',
|
| 'mojo_environment_chromium',
|
| - 'public/mojo_public.gyp:mojo_cpp_bindings',
|
| - 'public/mojo_public.gyp:mojo_public_test_utils',
|
| + 'mojo_public.gyp:mojo_cpp_bindings',
|
| + 'mojo_public.gyp:mojo_public_test_utils',
|
| ],
|
| 'sources': [
|
| 'common/common_type_converters_unittest.cc',
|
| @@ -145,10 +145,10 @@
|
| 'dependencies': [
|
| 'mojo_common_lib',
|
| 'mojo_environment_chromium',
|
| - 'public/mojo_public.gyp:mojo_application_base',
|
| + 'mojo_public.gyp:mojo_application_base',
|
| ],
|
| 'export_dependent_settings': [
|
| - 'public/mojo_public.gyp:mojo_application_base',
|
| + 'mojo_public.gyp:mojo_application_base',
|
| ],
|
| },
|
| ],
|
| @@ -177,8 +177,8 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| - 'edk/mojo_edk.gyp:mojo_system_impl',
|
| 'mojo_common_lib',
|
| + 'mojo_edk.gyp:mojo_system_impl',
|
| 'mojo_environment_chromium',
|
| 'mojo_jni_headers',
|
| ],
|
| @@ -202,7 +202,7 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base_java',
|
| 'libmojo_system_java',
|
| - 'public/mojo_public.gyp:mojo_public_java',
|
| + 'mojo_public.gyp:mojo_public_java',
|
| ],
|
| 'variables': {
|
| 'java_in_dir': '<(DEPTH)/mojo/android/system',
|
|
|