| Index: base/base.gyp
|
| diff --git a/base/base.gyp b/base/base.gyp
|
| index 78e6ddb0227291275a47d6c275fc4ff9704272ad..0f05164252a6b5af45cc3f8ede258b14892593eb 100644
|
| --- a/base/base.gyp
|
| +++ b/base/base.gyp
|
| @@ -345,9 +345,12 @@
|
| },
|
| 'dependencies': [
|
| 'base',
|
| + 'my_proto_lib',
|
| + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| ],
|
| 'export_dependent_settings': [
|
| 'base',
|
| + '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
| ],
|
| 'defines': [
|
| 'BASE_PREFS_IMPLEMENTATION',
|
| @@ -358,6 +361,8 @@
|
| 'prefs/default_pref_store.h',
|
| 'prefs/json_pref_store.cc',
|
| 'prefs/json_pref_store.h',
|
| + 'prefs/leveldb_pref_store.cc',
|
| + 'prefs/leveldb_pref_store.h',
|
| 'prefs/overlay_user_pref_store.cc',
|
| 'prefs/overlay_user_pref_store.h',
|
| 'prefs/persistent_pref_store.h',
|
| @@ -569,6 +574,7 @@
|
| 'power_monitor/power_monitor_unittest.cc',
|
| 'prefs/default_pref_store_unittest.cc',
|
| 'prefs/json_pref_store_unittest.cc',
|
| + 'prefs/leveldb_pref_store_unittest.cc',
|
| 'prefs/mock_pref_change_callback.h',
|
| 'prefs/overlay_user_pref_store_unittest.cc',
|
| 'prefs/pref_change_registrar_unittest.cc',
|
| @@ -682,8 +688,12 @@
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| + '../third_party/protobuf/protobuf.gyp:protobuf_lite',
|
| ],
|
| 'includes': ['../build/nocompile.gypi'],
|
| + 'include_dirs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
|
| + ],
|
| 'variables': {
|
| # TODO(ajwong): Is there a way to autodetect this?
|
| 'module_dir': 'base'
|
| @@ -1018,6 +1028,16 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'my_proto_lib',
|
| + 'type': 'static_library',
|
| + 'sources': [ 'prefs/json.proto' ],
|
| + 'variables': {
|
| + 'proto_in_dir': 'prefs',
|
| + 'proto_out_dir': 'base/prefs',
|
| + },
|
| + 'includes': ['../build/protoc.gypi'],
|
| + },
|
| ],
|
| 'conditions': [
|
| ['OS!="ios"', {
|
|
|