Граф коммитов

726 Коммитов

Автор SHA1 Сообщение Дата
glider@chromium.org 32e4687af7 Allow to override the location of ASan blacklist.
This is needed to build a CrOS binary, because the buildsystem doesn't play well with relative paths.

BUG=chromium-os:26919
Review URL: https://chromiumcodereview.appspot.com/9479002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@123935 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-28 07:27:58 +00:00
tony@chromium.org cf37037590 Fix linking when in a WebKit only checkout.
third_party is in a different location relative to the output directory
in WebKit only checkouts.


Review URL: http://codereview.chromium.org/9476013

git-svn-id: http://src.chromium.org/svn/trunk/src/build@123892 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-28 05:17:26 +00:00
evan@chromium.org 1a8484f085 linux: don't instrument mmx functions
Shadow stacks use -finstrument-functions to hook all function entry/exit.
But mmx-related functions expect to be inlined so the compiler can
compile them out into mmx instructions.

This change excludes the mmx intrinsics header file from instrumentation.
Without it, builds wil fail with errors like the following:

../../third_party/gold/gold64: obj/media/libyuv_convert.a(obj/media/base/yuv_convert.yuv_convert.o): in function media::EmptyRegisterState():yuv_convert.cc(.text._ZN5media18EmptyRegisterStateEv+0x29): error: undefined reference to '_mm_empty()'

(_mm_empty() is an mmx intrinsic function.)


Review URL: http://codereview.chromium.org/9416068

git-svn-id: http://src.chromium.org/svn/trunk/src/build@123289 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-23 19:10:51 +00:00
fsamuel@chromium.org fda208871a Compute pageScaleFactor on page so that fixed layout page fits width of window.
Fixed layout mode can now be enabled with the command line
flag --enable-fixed-layout.

This mode does not interact well with zoom at this point in time. This will be fixed shortly.

This bug replaces http://codereview.chromium.org/7764006/ which is no longer relevant. 

BUG=none
TEST=manually


Review URL: http://codereview.chromium.org/7831028

git-svn-id: http://src.chromium.org/svn/trunk/src/build@123126 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-22 23:08:05 +00:00
glider@chromium.org e316690e6f Fix the path issues in ASan+ninja build
Review URL: https://chromiumcodereview.appspot.com/9372062

git-svn-id: http://src.chromium.org/svn/trunk/src/build@123019 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-22 10:22:29 +00:00
glider@chromium.org 0c53890669 Pass -asan-blacklist when building with ASan
Review URL: https://chromiumcodereview.appspot.com/9424048

git-svn-id: http://src.chromium.org/svn/trunk/src/build@122831 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-21 16:51:09 +00:00
yoshiki@chromium.org 82b24f1650 Enable WebUI TaskManager by default.
Back to WebUI Task Manager, since M18 branch point has been passed.

BUG=99029
TEST=manual on linux and cros

Review URL: http://codereview.chromium.org/9355053

git-svn-id: http://src.chromium.org/svn/trunk/src/build@122806 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-21 09:53:16 +00:00
erg@chromium.org e29444abc6 Linux: Remove references to '-nopie' now that it's fixed in cros and doesn't exist on Pangolin.
BUG=cros:15266,79722


Review URL: http://codereview.chromium.org/9414022

git-svn-id: http://src.chromium.org/svn/trunk/src/build@122387 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-16 23:26:05 +00:00
eugenis@google.com 23fd55325e Disable ASan for host targets on Android.
They are always x86_32, and Clang only builds a x86_64 ASan runtime by default.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9413005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@122279 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-16 11:42:12 +00:00
jrg@chromium.org bff44a8069 Disable gold for Android. Causes sporadic build breakage.
BUG=None
TEST=


Review URL: http://codereview.chromium.org/9382038

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121668 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-12 18:09:46 +00:00
asvitkine@chromium.org f542800660 Disable use_canvas_skia_skia=1 on Windows until CJK font fallback is working.
This is a revert of http://crrev.com/120710.

BUG=113437, 105550
TEST=none
TBR=sky@chromium.org

Review URL: http://codereview.chromium.org/9383032

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121638 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-11 04:48:30 +00:00
evan@chromium.org 2ff34ef0cc Revert "Build fix: no gold on any ChromeOS build."
This reverts commit r121264, the bot is just sick.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121267 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 19:33:51 +00:00
evan@chromium.org a3be503eb9 Build fix: no gold on any ChromeOS build.
On a Google-internal ChromeOS builder make seems to exit with a
failure code no error message I can identify.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121264 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 19:26:27 +00:00
evan@chromium.org 26bc9879f9 linux: migrate linker --threads flag out of gyp
(Retry of r121148 with ChromeOS excluded.)

This just copies the flags used within gyp.

BUG=gyp:250

Review URL: http://codereview.chromium.org/9360032

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121257 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 19:00:17 +00:00
wjia@chromium.org 4bef0864ce disable media stream creation when enable_webrtc=0
BUG=110581
Review URL: https://chromiumcodereview.appspot.com/9369022

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121252 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 18:19:32 +00:00
csilv@chromium.org 28154f0194 Revert 121165 - Revert 121068 - linux: add a use_gold flag that defaults to on
[This CL was backed out speculatively due to failures on the cros trunk bot. But this CL
was not the cause of that problem, so I'm un-doing the revert.]

Currently, gyp attempts to autodetect whether the linker supports
the --icf flag.  It's more predictable to just require the caller
to specify whether they're using gold.

As a first demonstration of this, drop LINKER_USES_ICF code in the
Chrome build.  (I'll follow up with a gyp patch to remove the
LINKER_USES_ICF stuff in gyp.)

Review URL: https://chromiumcodereview.appspot.com/9368015

TBR=evan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9372012

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121175 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 03:49:00 +00:00
csilv@chromium.org 0596e8b288 Revert 121068 - linux: add a use_gold flag that defaults to on
Currently, gyp attempts to autodetect whether the linker supports
the --icf flag.  It's more predictable to just require the caller
to specify whether they're using gold.

As a first demonstration of this, drop LINKER_USES_ICF code in the
Chrome build.  (I'll follow up with a gyp patch to remove the
LINKER_USES_ICF stuff in gyp.)


Review URL: http://codereview.chromium.org/9316110

TBR=evan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9368015

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121165 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 03:06:06 +00:00
gman@chromium.org e852276776 Revert 121148 - linux: migrate linker --threads flag out of gyp
This just copies the flags used within gyp.

BUG=gyp:250


Review URL: http://codereview.chromium.org/9360032

TBR=evan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9368014

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121163 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 02:39:41 +00:00
evan@chromium.org ae708a3db4 linux: migrate linker --threads flag out of gyp
This just copies the flags used within gyp.

BUG=gyp:250


Review URL: http://codereview.chromium.org/9360032

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121148 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-09 01:59:40 +00:00
mark@chromium.org af02052ef9 Back out r121079 from the trunk, because it was checked in without permission
to a closed tree.

Back to WebUI Task Manager, since M18 branch point has been passed.

Revert 119612 - WebUI TaskManager: Turn it off by default on Win/Mac/Linux

WebUI Task Manager does not ship on M18 on Desktop Chromes (Win/Mac/Linux) so that task manager have been disabled temporary. On Chrome OS and Aura, it is still enabled.

BUG=97429
TEST=manual on linux and aura


Review URL: http://codereview.chromium.org/9290042

TBR=yoshiki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9361050

TBR=yoshiki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348075

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121082 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-08 23:06:44 +00:00
yoshiki@chromium.org a6ea5f7c9c Back to WebUI Task Manager, since M18 branch point has been passed.
Revert 119612 - WebUI TaskManager: Turn it off by default on Win/Mac/Linux

WebUI Task Manager does not ship on M18 on Desktop Chromes (Win/Mac/Linux) so that task manager have been disabled temporary. On Chrome OS and Aura, it is still enabled.

BUG=97429
TEST=manual on linux and aura


Review URL: http://codereview.chromium.org/9290042

TBR=yoshiki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9361050

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121079 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-08 23:04:04 +00:00
evan@chromium.org 2ada780735 linux: add a use_gold flag that defaults to on
Currently, gyp attempts to autodetect whether the linker supports
the --icf flag.  It's more predictable to just require the caller
to specify whether they're using gold.

As a first demonstration of this, drop LINKER_USES_ICF code in the
Chrome build.  (I'll follow up with a gyp patch to remove the
LINKER_USES_ICF stuff in gyp.)


Review URL: http://codereview.chromium.org/9316110

git-svn-id: http://src.chromium.org/svn/trunk/src/build@121068 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-08 22:04:58 +00:00
saintlou@chromium.org 77a3de0b94 Add flag to build old ChromeOS (pre-Aura). Thus allowing us to have a bot on the main waterfall.
BUG=112962
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9346007

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120784 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-07 16:36:06 +00:00
ivankr@chromium.org 52ad43c3ee Enable internal gold for ChromeOS.
BUG=None
TEST=Manual: chrome builds with chromeos=1 on a 64-bit machine without a system gold binary.

Review URL: https://chromiumcodereview.appspot.com/9325068

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120762 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-07 11:04:39 +00:00
asvitkine@chromium.org b7f78c3655 Enable canvas_skia_skia.cc on Windows.
BUG=105550
TEST=All UI text looks the same as before.

Review URL: http://codereview.chromium.org/9298015

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120710 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-07 04:28:22 +00:00
saintlou@chromium.org d9132b3ae1 Reverting: https://chromiumcodereview.appspot.com/9316112/
which prevents building chromeos with gtk

TBR=thestig@chromium.org
BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9351004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120684 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-07 01:54:50 +00:00
saintlou@chromium.org 7266888ce8 First pass at chrome_browser gyp simplification.
BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9316112

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120526 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-05 20:16:21 +00:00
evan@chromium.org ce1c30f2e7 linux: use an in-tree copy of gold by default
(Reland of r120385 with newer third_party/gold.)

Rather than forcing everyone to configure their search paths etc.
we should just make this work by default.  You can set
the gyp variable linux_use_gold_binary=0 to turn it off.

Review URL: https://chromiumcodereview.appspot.com/9316002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120424 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-03 22:44:59 +00:00
tim@chromium.org 67f477b874 Revert 120385 - linux: use an in-tree copy of gold by default
Rather than forcing everyone to configure their search paths etc.
we should just make this work by default.  You can set
the gyp variable linux_use_gold_binary=0 to turn it off.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120356

Review URL: https://chromiumcodereview.appspot.com/9316002

TBR=evan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9328004

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120397 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-03 20:55:52 +00:00
evan@chromium.org 858c60c730 linux: use an in-tree copy of gold by default
Rather than forcing everyone to configure their search paths etc.
we should just make this work by default.  You can set
the gyp variable linux_use_gold_binary=0 to turn it off.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=120356

Review URL: https://chromiumcodereview.appspot.com/9316002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120385 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-03 20:19:47 +00:00
evan@chromium.org f0d8d123ba Revert "linux: use an in-tree copy of gold by default"
This reverts commit r120356.  Build failures on 32-bit Linux.

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120361 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-03 19:28:28 +00:00
evan@chromium.org 91e8e93f95 linux: use an in-tree copy of gold by default
Rather than forcing everyone to configure their search paths etc.
we should just make this work by default.  You can set
the gyp variable linux_use_gold_binary=0 to turn it off.

Review URL: https://chromiumcodereview.appspot.com/9316002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120356 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-03 18:23:54 +00:00
saintlou@chromium.org c0f7c9ce5f Enable Aura for all ChromeOS builds in Chromium.
This will be landed after this: https://gerrit.chromium.org/gerrit/#change,14752

BUG=112154
TEST=build with chromeos==1 in gyp and see Aura desktop.

Review URL: https://chromiumcodereview.appspot.com/9315009

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120240 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-02 21:40:05 +00:00
evan@chromium.org b58f88abbf build/common.gypi: delete an unused variable
TBR=thakis

Review URL: http://codereview.chromium.org/9315018

git-svn-id: http://src.chromium.org/svn/trunk/src/build@120004 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-02-01 01:51:15 +00:00
junov@chromium.org 45f32dc1b2 Removing unused gyp variable use_threaded_compositing
BUG=111192
TEST=NONE

Review URL: http://codereview.chromium.org/9285015

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119688 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-30 17:50:29 +00:00
piman@chromium.org 9dfe2082f3 Merge Compositor and CompositorCC
This also removes a few unused calls.

BUG=None
TEST=compiles, tests pass


Review URL: http://codereview.chromium.org/9297041

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119645 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-29 21:22:13 +00:00
thakis@chromium.org 67747622ed roll clang 148039:148911
BUG=97532,111806,111208 (maybe?)
TEST=none
TBR=hans

Review URL: http://codereview.chromium.org/9297028

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119637 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-29 09:02:10 +00:00
yoshiki@chromium.org 30138beafb WebUI TaskManager: Turn it off by default on Win/Mac/Linux
WebUI Task Manager does not ship on M18 on Desktop Chromes (Win/Mac/Linux) so that task manager have been disabled temporary. On Chrome OS and Aura, it is still enabled.

BUG=97429
TEST=manual on linux and aura


Review URL: http://codereview.chromium.org/9290042

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119612 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-28 14:50:33 +00:00
piman@chromium.org 1f61a871e9 Fold views_compositor=1 into use_aura=1
We don't have a use case for views_compositor=1 and use_aura=0 (and it's
broken/untested anyway), so this simplifies things a little bit.

BUG=None
TEST=compiles, tests pass.


Review URL: http://codereview.chromium.org/9225038

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119583 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-28 03:23:01 +00:00
tony@chromium.org 2f6c313084 Add Malay as a translation.
The language code is ms.  This adds the necessary files to generate
the locale pak file.  Translations will arrive later.

BUG=111670
TBR=gfeher

Review URL: http://codereview.chromium.org/9232056

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119548 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-28 00:57:19 +00:00
gbillock@chromium.org dff30693e2 Revert 119306 - Turn web intents build flag on.
Move the command-line flag to default-on.

(Revert of 119284 : https://chromiumcodereview.appspot.com/9212036)

IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.

R=jhawkins@chromium.org
BUG=111135
TEST=None


Review URL: http://codereview.chromium.org/9271084

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119423 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-27 09:36:11 +00:00
evan@chromium.org 734901a222 build/common.gypi: split out filename exclude rules
Here's a step towards making this enormous file a little more tractable.


Review URL: http://codereview.chromium.org/9288078

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119372 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-27 04:55:13 +00:00
evan@chromium.org 9db74ccd02 common.gypi: move harfbuzz-NG setting out into harfbuzz project
Less code in the central gyp file, more code near where it's
used.

Review URL: http://codereview.chromium.org/9271077

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119348 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-27 02:44:00 +00:00
gbillock@chromium.org ab8a36fb63 Revert 119284 - Turn web intents build flag on. Move the command-line flag to default on.
Make the flag disable rather than enable web intents.
Put the options UI behind a new flag controlling functionality if the registration tag is present for web content.

IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.

R=jhawkins@chromium.org
BUG=90458
TEST=None

Review URL: https://chromiumcodereview.appspot.com/9212036

TBR=gbillock@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9113095

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119306 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-26 22:56:39 +00:00
gbillock@chromium.org a3549f92db Turn web intents build flag on. Move the command-line flag to default on.
Make the flag disable rather than enable web intents.
Put the options UI behind a new flag controlling functionality if the registration tag is present for web content.

IN CASE OF FIRE, PULL THIS HANDLE! If web intents needs
to be disabled, revert this change.

R=jhawkins@chromium.org
BUG=90458
TEST=None

Review URL: https://chromiumcodereview.appspot.com/9212036

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119284 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-26 20:55:13 +00:00
evan@chromium.org faabbc9b1c linux: don't make -Werror setting conditional on OS
People who need to adjust this should adjust it directly.
Guessing just makes everything more confusing.


Review URL: http://codereview.chromium.org/9288008

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119092 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25 18:32:31 +00:00
evan@chromium.org fd65048d52 Use a 'defines' block instead of adding -Dfoo to cflags.
Should be equivalent, but simpler.


Review URL: http://codereview.chromium.org/9235021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119087 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25 17:51:36 +00:00
asvitkine@chromium.org dc135aa62e Add implementation of CanvasSkia based on RenderText.
This allows text drawing entirely through Skia, since RenderText ultimately uses
Skia to draw character glyphs.

This CL adds the new code, but does not yet enable it on any platforms. That
will be done in later CLs.

Note: Some functions, such as CanvasSkia::DrawStringWithHalo() and
PixelShouldGetHalo() are taken almost verbatim from the canvas_skia_win.cc
implementation.

BUG=105550
TEST=none

Review URL: http://codereview.chromium.org/9074005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119086 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25 17:49:35 +00:00
glotov@google.com 929da149d7 Initial commit of profile guided optimization option
FYI, instrumentation code that provides the orderfile is here: http://codereview.chromium.org/8770054/

BUG=chromiumos:20187
TEST=bootperf, see https://sites.google.com/a/google.com/chrome-msk/dev/boot-speed-up-effort

Review URL: https://chromiumcodereview.appspot.com/9131011

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119073 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25 15:30:46 +00:00
piman@chromium.org c539c5bac8 Always use webkit compositor
BUG=None
TEST=None

Review URL: http://codereview.chromium.org/9141034

git-svn-id: http://src.chromium.org/svn/trunk/src/build@118987 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25 02:40:20 +00:00