| Index: components/enhanced_bookmarks.gypi
|
| diff --git a/components/enhanced_bookmarks.gypi b/components/enhanced_bookmarks.gypi
|
| index 8f0be9e706c8b759d302f8dd2eab46ade395a918..f1ced89eb1afe2dc20e419a580c609c1f2cec5b4 100644
|
| --- a/components/enhanced_bookmarks.gypi
|
| +++ b/components/enhanced_bookmarks.gypi
|
| @@ -32,6 +32,17 @@
|
| 'enhanced_bookmarks/persistent_image_store.h',
|
| ],
|
| 'conditions': [
|
| + ['OS=="android"', {
|
| + 'sources': [
|
| + 'enhanced_bookmarks/android/component_jni_registrar.cc',
|
| + 'enhanced_bookmarks/android/component_jni_registrar.h',
|
| + 'enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc',
|
| + 'enhanced_bookmarks/android/enhanced_bookmarks_bridge.h',
|
| + ],
|
| + 'dependencies': [
|
| + 'enhanced_bookmarks_jni_headers',
|
| + ],
|
| + }],
|
| ['OS=="ios"', {
|
| 'sources!': [
|
| 'enhanced_bookmarks/image_store_util.cc',
|
| @@ -54,17 +65,45 @@
|
| 'enhanced_bookmarks/test_image_store.h',
|
| ],
|
| },
|
| - {
|
| - 'target_name': 'enhanced_bookmarks_proto',
|
| - 'type': 'static_library',
|
| - 'sources': [
|
| - 'enhanced_bookmarks/proto/metadata.proto',
|
| + ],
|
| + 'conditions' : [
|
| + ['OS=="android"', {
|
| + 'targets': [
|
| + {
|
| + 'target_name': 'enhanced_bookmarks_proto',
|
| + 'type': 'static_library',
|
| + 'sources': [
|
| + 'enhanced_bookmarks/proto/metadata.proto',
|
| + ],
|
| + 'variables': {
|
| + 'proto_in_dir': './enhanced_bookmarks/proto',
|
| + 'proto_out_dir': 'components/enhanced_bookmarks/proto',
|
| + },
|
| + 'includes': [ '../build/protoc.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'enhanced_bookmarks_java',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + 'components.gyp:bookmarks_java'
|
| + ],
|
| + 'variables': {
|
| + 'java_in_dir': 'enhanced_bookmarks/android/java',
|
| + },
|
| + 'includes': [ '../build/java.gypi' ],
|
| + },
|
| + {
|
| + 'target_name': 'enhanced_bookmarks_jni_headers',
|
| + 'type': 'none',
|
| + 'sources': [
|
| + 'enhanced_bookmarks/android/java/src/org/chromium/components/enhancedbookmarks/EnhancedBookmarksBridge.java',
|
| + ],
|
| + 'variables': {
|
| + 'jni_gen_package': 'enhanced_bookmarks',
|
| + },
|
| + 'includes': [ '../build/jni_generator.gypi' ],
|
| + },
|
| ],
|
| - 'variables': {
|
| - 'proto_in_dir': './enhanced_bookmarks/proto',
|
| - 'proto_out_dir': 'components/enhanced_bookmarks/proto',
|
| - },
|
| - 'includes': [ '../build/protoc.gypi' ],
|
| - },
|
| + }]
|
| ],
|
| }
|
|
|