Chromium Code Reviews| Index: chromecast/chromecast.gyp |
| diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp |
| index 9519c651dd00199f7ce7d94e233879fc57ade99f..ef788c421bdb3b51441a36e27d800627a5208b33 100644 |
| --- a/chromecast/chromecast.gyp |
| +++ b/chromecast/chromecast.gyp |
| @@ -454,12 +454,12 @@ |
| 'sources': [ |
| 'base/cast_sys_info_android.cc', |
| 'base/cast_sys_info_android.h', |
| + 'base/chromecast_config_android.cc', |
| + 'base/chromecast_config_android.h', |
| 'android/cast_jni_registrar.cc', |
| 'android/cast_jni_registrar.h', |
| 'android/cast_metrics_helper_android.cc', |
| 'android/cast_metrics_helper_android.h', |
| - 'android/chromecast_config_android.cc', |
| - 'android/chromecast_config_android.h', |
| 'android/platform_jni_loader.h', |
| 'app/android/cast_jni_loader.cc', |
| 'browser/android/cast_window_android.cc', |
| @@ -478,17 +478,28 @@ |
| ], |
| }, { |
| 'sources': [ |
| - 'android/chromecast_config_android_stub.cc', |
| 'android/platform_jni_loader_stub.cc', |
| ], |
| }] |
| ], |
| }, # end of target 'libcast_shell_android' |
| { |
| + 'target_name': 'cast_base_java', |
|
slan
2015/06/11 15:12:46
Why is this target necessary?
gunsch
2015/06/11 16:35:44
So far, we haven't had a pattern for having multip
|
| + 'type': 'none', |
| + 'dependencies': [ |
| + '../base/base.gyp:base_java', |
| + ], |
| + 'variables': { |
| + 'java_in_dir': 'base/java', |
| + }, |
| + 'includes': ['../build/java.gypi'], |
| + }, # end of target 'cast_shell_java' |
|
slan
2015/06/11 15:12:45
# end of target 'cast_base_java'
gunsch
2015/06/11 16:35:44
Done.
|
| + { |
| 'target_name': 'cast_shell_java', |
| 'type': 'none', |
| 'dependencies': [ |
| '<(android_support_v13_target)', |
| + 'cast_base_java', |
| '../base/base.gyp:base_java', |
| '../components/components.gyp:external_video_surface_java', |
| '../content/content.gyp:content_java', |
| @@ -542,6 +553,7 @@ |
| 'target_name': 'cast_jni_headers', |
| 'type': 'none', |
| 'sources': [ |
| + 'base/java/src/org/chromium/chromecast/base/ChromecastConfigAndroid.java', |
| 'browser/android/apk/src/org/chromium/chromecast/shell/CastCrashHandler.java', |
| 'browser/android/apk/src/org/chromium/chromecast/shell/CastMetricsHelper.java', |
| 'browser/android/apk/src/org/chromium/chromecast/shell/CastSysInfoAndroid.java', |