diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 02:59:07 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 02:59:07 +0000 |
| commit | e17fd74ae492c7ef1e1388d9a2ea6a061e33f8ac (patch) | |
| tree | 5216f5536956adc5dcd831327ea209211a30f752 /ui/oak | |
| parent | 0b415ad6029aa354c027b30ba1f3fefa71578360 (diff) | |
| download | chromium_src-e17fd74ae492c7ef1e1388d9a2ea6a061e33f8ac.zip chromium_src-e17fd74ae492c7ef1e1388d9a2ea6a061e33f8ac.tar.gz chromium_src-e17fd74ae492c7ef1e1388d9a2ea6a061e33f8ac.tar.bz2 | |
Broke the aura compile on Linux and Windows.
out/Release/../../third_party/gold/gold64:
out/Release/obj.target/ash/libash.so:error: undefined reference to
'oak::ShowOakWindow()'
Revert 136217 - ui/oak: Build oak as a component library.
And export ShowOakWindow() function.
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10310050
TBR=tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10389058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak')
| -rw-r--r-- | ui/oak/oak.gyp | 3 | ||||
| -rw-r--r-- | ui/oak/oak.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index 9b17fc3..b564b99 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -10,10 +10,11 @@ 'targets': [ { 'target_name': 'oak', - 'type': '<(component)', + 'type': 'static_library', 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', '../aura/aura.gyp:aura', '../compositor/compositor.gyp:compositor', diff --git a/ui/oak/oak.h b/ui/oak/oak.h index 757ebad..47af72e 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 UI_OAK_OAK_H_ -#define UI_OAK_OAK_H_ +#ifndef ASH_OAK_OAK_WINDOW_H_ +#define ASH_OAK_OAK_WINDOW_H_ #pragma once #include "ui/oak/oak_export.h" @@ -11,8 +11,8 @@ namespace oak { // Shows the Oak window. Refocuses an existing one. -OAK_EXPORT void ShowOakWindow(); +void ShowOakWindow(); } // namespace oak -#endif // UI_OAK_OAK_H_ +#endif // ASH_OAK_OAK_WINDOW_H_ |