Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Unified Diff: components/bookmarks.gypi

Issue 459973004: [Android] EnhancedBookmarksBridge for bookmark description read&write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: java DEPS fix Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | components/bookmarks/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks.gypi
diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi
index c88c26e5043246d1942b0d1b2454e7915bfdc03b..9d70d3350c9a98016470928d5f2d3b8a007e8737 100644
--- a/components/bookmarks.gypi
+++ b/components/bookmarks.gypi
@@ -57,6 +57,20 @@
'bookmarks/browser/scoped_group_bookmark_actions.cc',
'bookmarks/browser/scoped_group_bookmark_actions.h',
],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ 'bookmarks_jni_headers',
+ ],
+ 'sources' : [
+ 'bookmarks/common/android/bookmark_id.cc',
+ 'bookmarks/common/android/bookmark_id.h',
+ 'bookmarks/common/android/bookmark_type_list.h',
+ 'bookmarks/common/android/component_jni_registrar.cc',
+ 'bookmarks/common/android/component_jni_registrar.h',
+ ],
+ }],
+ ],
},
{
'target_name': 'bookmarks_common',
@@ -104,4 +118,45 @@
],
},
],
+ 'conditions' : [
+ ['OS=="android"', {
+ 'targets': [
+ {
+ 'target_name': 'bookmarks_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ 'bookmark_type_java',
+ ],
+ 'variables': {
+ 'java_in_dir': 'bookmarks/common/android/java',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
+ {
+ 'target_name': 'bookmarks_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkId.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'components/bookmarks',
+ },
+ 'includes': [ '../build/jni_generator.gypi' ],
+ },
+ {
+ 'target_name': 'bookmark_type_java',
+ 'type': 'none',
+ 'sources': [
+ 'bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkType.template',
+ ],
+ 'variables': {
+ 'package_name': 'org/chromium/components/bookmarks',
+ 'template_deps': ['bookmarks/common/android/bookmark_type_list.h'],
+ },
+ 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ },
+ ],
+ }]
+ ],
}
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | components/bookmarks/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698