Chromium Code Reviews| Index: content/content_common.gypi |
| diff --git a/content/content_common.gypi b/content/content_common.gypi |
| index 767602ce0f5a035f5cefdbf28f309e6e3560bf65..99842e60469dc3f76ca278c755e46e7685095115 100644 |
| --- a/content/content_common.gypi |
| +++ b/content/content_common.gypi |
| @@ -100,8 +100,12 @@ |
| 'common/android/address_parser.h', |
| 'common/android/address_parser_internal.cc', |
| 'common/android/address_parser_internal.h', |
| + 'common/android/surface_callback.cc', |
| + 'common/android/surface_callback.h', |
| 'common/appcache/appcache_backend_proxy.cc', |
| 'common/appcache/appcache_backend_proxy.h', |
| + 'common/android/surface_texture_peer.cc', |
|
Yaron
2012/06/11 19:46:22
NIT: Sorting is a bit off
michaelbai
2012/06/11 20:30:16
Done.
|
| + 'common/android/surface_texture_peer.h', |
| 'common/appcache/appcache_dispatcher.cc', |
| 'common/appcache/appcache_dispatcher.h', |
| 'common/appcache_messages.h', |
| @@ -342,6 +346,31 @@ |
| 'common/sandbox_policy.h', |
| ], |
| }], |
| + ['OS=="android"',{ |
| + 'targets': [ |
| + { |
| + 'target_name': 'common_aidl', |
| + 'type': 'none', |
| + 'variables': { |
| + 'aidl_interface_file': '../content/public/android/java/org/chromium/content/common/common.aidl', |
| + }, |
| + 'sources': [ |
| + '../content/public/android/java/org/chromium/content/common/ISandboxedProcessCallback.aidl', |
| + '../content/public/android/java/org/chromium/content/common/ISandboxedProcessService.aidl', |
| + ], |
| + 'includes': [ '../build/java_aidl.gypi' ], |
| + }, |
| + ], |
| + 'link_settings': { |
| + 'libraries': [ |
| + '-landroid', # ANativeWindow |
| + ], |
| + }, |
| + 'dependencies': [ |
| + 'content.gyp:content_jni_headers', |
| + 'common_aidl', |
| + ], |
| + }], |
| ['toolkit_uses_gtk == 1', { |
| 'dependencies': [ |
| '../build/linux/system.gyp:gtk', |