commit 2e6543ddad0b7d64697bb2326a5cfd1ab835a489
author Ben Chan <benchan@chromium.org> Wed Feb 05 23:26:25 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Feb 12 19:39:45 2014 +0000
tree 3485c79fc80d761d11d47f66f49e2881e3fe860f
parent 09a15fa95486f7b6a3197366241827a23392918b

Update to build against libchrome-242728.

This CL updates metrics to build against libchrome-242728 and also converts
libmetrics into slotted libraries (libmetrics-180609 and libmetrics-242728).

BUG=chromium:341521
BUG=chromium:342866
CQ-DEPEND=CL:186027
CQ-DEPEND=CL:186026
CQ-DEPEND=CL:186037
CQ-DEPEND=CL:186092
CQ-DEPEND=CL:186028
CQ-DEPEND=CL:186029
CQ-DEPEND=CL:186038
CQ-DEPEND=CL:186093
CQ-DEPEND=CL:186100
CQ-DEPEND=CL:186039
TEST=Trybot run on paladin, release, and chromiumos-sdk builders.

Change-Id: I09dc3d47cfe24a22864abf217658c63493b35cba
Reviewed-on: https://chromium-review.googlesource.com/185187
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

metrics/metrics.gyp

diff --git a/metrics/metrics.gyp b/metrics/metrics.gyp
index 9709c35..0a5ac48 100644
--- a/metrics/metrics.gyp
+++ b/metrics/metrics.gyp
@@ -1,48 +1,32 @@
 {
+  'variables': {
+    'libbase_ver': 242728,
+  },
   'target_defaults': {
-      'dependencies': [
-        '../libchromeos/libchromeos-<(libbase_ver).gyp:libchromeos-<(libbase_ver)',
-      ],
-      'variables': {
-        'deps': [
-          'dbus-1',
-          'dbus-glib-1',
-          'glib-2.0',
-          'gobject-2.0',
-          'gthread-2.0',
-          'libchrome-<(libbase_ver)',
-        ]
-      },
-      'cflags_cc': [
-        '-fno-exceptions',
-      ],
+    'dependencies': [
+      '../libchromeos/libchromeos-<(libbase_ver).gyp:libchromeos-<(libbase_ver)',
+    ],
+    'variables': {
+      'deps': [
+        'dbus-1',
+        'dbus-glib-1',
+        'glib-2.0',
+        'gobject-2.0',
+        'gthread-2.0',
+        'libchrome-<(libbase_ver)',
+      ]
+    },
+    'cflags_cc': [
+      '-fno-exceptions',
+    ],
   },
   'targets': [
     {
-      'target_name': 'metrics',
-      'type': 'static_library',
-      'sources': [
-        'c_metrics_library.cc',
-        'metrics_library.cc',
-        'timer.cc',
-      ],
-    },
-    {
-      'target_name': 'libmetrics',
-      'type': 'shared_library',
-      'cflags': [
-        '-fvisibility=default',
-      ],
-      'sources': [
-        'c_metrics_library.cc',
-        'metrics_library.cc',
-        'timer.cc',
-      ],
-    },
-    {
       'target_name': 'libmetrics_daemon',
       'type': 'static_library',
-      'dependencies': ['libmetrics'],
+      'dependencies': [
+        '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
+      ],
       'link_settings': {
         'libraries': [
           '-lrootdev',
@@ -58,7 +42,9 @@
     {
       'target_name': 'metrics_client',
       'type': 'executable',
-      'dependencies': ['libmetrics'],
+      'dependencies': [
+        '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
+      ],
       'sources': [
         'metrics_client.cc',
       ]
@@ -79,7 +65,9 @@
         {
           'target_name': 'metrics_library_test',
           'type': 'executable',
-          'dependencies': ['libmetrics'],
+          'dependencies': [
+            '../metrics/libmetrics-<(libbase_ver).gyp:libmetrics-<(libbase_ver)',
+          ],
           'includes': ['../common-mk/common_test.gypi'],
           'sources': [
             'metrics_library_test.cc',