diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 15:18:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-25 15:18:18 +0000 |
| commit | a6709eb3616e9af71a12a4eb436e2a55358b6386 (patch) | |
| tree | a0c556128729f1116bbb20f94388e3f1f9221b9d /ui/oak | |
| parent | ac4ea5f6d5973d8c2cfd8015ba7dd5925342b316 (diff) | |
| download | chromium_src-a6709eb3616e9af71a12a4eb436e2a55358b6386.zip chromium_src-a6709eb3616e9af71a12a4eb436e2a55358b6386.tar.gz chromium_src-a6709eb3616e9af71a12a4eb436e2a55358b6386.tar.bz2 | |
oak: Fix component build.
The first patch that tried to convert oak from static_library to component was
r136217, but later it was reverted in r136229 because it broke the aura
compile on Linux and Windows with the following error:
out/Release/../../third_party/gold/gold64:
out/Release/obj.target/ash/libash.so:error: undefined reference to
'oak::ShowOakWindow()'to...
The only change here from the first patch was the addition of oak.h include in
oak_window.cc, and that addition seems to have fixed the above issue.
I'll make sure it passes linux_aura,win_aura before landing this again.
TEST=run out/Debug/ash_shell --ash-enable-oak, press Ctrl+Shift+F1, the Oak
window should appear and it should work fine.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10453007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak')
| -rw-r--r-- | ui/oak/oak.gyp | 2 | ||||
| -rw-r--r-- | ui/oak/oak.h | 8 | ||||
| -rw-r--r-- | ui/oak/oak_window.cc | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index b564b99..f69b2ba 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -10,7 +10,7 @@ 'targets': [ { 'target_name': 'oak', - 'type': 'static_library', + 'type': '<(component)', 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', diff --git a/ui/oak/oak.h b/ui/oak/oak.h index 47af72e..757ebad 100644 --- a/ui/oak/oak.h +++ b/ui/oak/oak.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_OAK_OAK_WINDOW_H_ -#define ASH_OAK_OAK_WINDOW_H_ +#ifndef UI_OAK_OAK_H_ +#define UI_OAK_OAK_H_ #pragma once #include "ui/oak/oak_export.h" @@ -11,8 +11,8 @@ namespace oak { // Shows the Oak window. Refocuses an existing one. -void ShowOakWindow(); +OAK_EXPORT void ShowOakWindow(); } // namespace oak -#endif // ASH_OAK_OAK_WINDOW_H_ +#endif // UI_OAK_OAK_H_ diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc index 6777b7e..5266336 100644 --- a/ui/oak/oak_window.cc +++ b/ui/oak/oak_window.cc @@ -4,6 +4,7 @@ #include "ui/oak/oak_window.h" +#include "ui/oak/oak.h" #include "base/utf_string_conversions.h" #include "grit/ui_resources.h" #include "ui/aura/root_window.h" |