Mike Hommey
ccdc7b4993
Bug 883339 - Enable gtest on windows TBPL non-PGO builds. r=ted
2014-06-26 07:59:24 +09:00
Mike Hommey
b02a375963
Bug 1027890 - Remove all sorts of build system code dedicated to pymake. r=gps
2014-06-25 08:38:28 +09:00
Mike Hommey
df8ec65f6f
Bug 1027890 - Reject builds with pymake. r=gps
...
--HG--
extra : rebase_source : a662b896b5f431a37a1250ec19451324ebed3d14
2014-06-25 08:38:12 +09:00
Brian R. Bondy
9886164729
Bug 598615 - Rename HAVE_64BIT_OS to HAVE_64BIT_BUILD. r=ted
2014-06-24 22:16:25 -04:00
Wes Kocher
d9ec170da8
Backed out 2 changesets (bug 1027890) for B2G Windows Build bustage on a CLOSED TREE
...
Backed out changeset bcd694f0e95d (bug 1027890)
Backed out changeset 49cadfcde709 (bug 1027890)
2014-06-24 18:33:46 -07:00
Mike Hommey
f59abd2745
Bug 1027890 - Remove all sorts of build system code dedicated to pymake. r=gps
2014-06-25 08:38:28 +09:00
Mike Hommey
7796518a26
Bug 1027890 - Reject builds with pymake. r=gps
2014-06-25 08:38:12 +09:00
Mike Hommey
c18fc659a4
Bug 1027034 - Properly set up Gtk+3 compatibility headers. r=karlt
...
--HG--
rename : widget/gtk/compat/gtk/gtkenums.h => widget/gtk/compat-gtk3/gtk/gtkenums.h
2014-06-19 09:06:14 +09:00
Ryan VanderMeulen
19951668ea
Bug 1025918 - Add support for the .cxx extension to mozbuild. r=ted
2014-06-16 22:36:24 -04:00
Nathan Froyd
319b400465
Bug 1018375 - part 1 - add LD_VERSION_SCRIPT build variable; r=glandium
2014-05-30 14:12:20 -04:00
Mike Hommey
e6a3424a1b
Fixup for bug 1024620 on a CLOSED TREE. r=me
2014-06-14 09:24:39 +09:00
Mike Hommey
2d280ff77e
Bug 1024620 - Use object files next to archives when extracting them at link time, or in a subdirectory. r=ted
2014-06-14 09:08:22 +09:00
Wes Johnston
f33f467131
Bug 1006158 - Add ability to pull in v7 libraries and google support libraries. r=nalexander
2014-06-11 11:00:17 -07:00
ffxbld
d5e7d47bda
Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release
2014-06-09 11:50:02 -07:00
Mike Hommey
d1b1bdcf19
Bug 1014976 - Don't define _DEBUG on Windows debug builds, it's implied by -MDd/-MTd, and breaks builds with -MD/-MT. r=bsmedberg
2014-05-30 09:39:53 +09:00
Randell Jesup
79df25773b
Bug 987979: Patch 3 - Fix various build issues in webrtc.org/Mozilla integration. r=rjesup
2014-05-29 17:05:14 -04:00
Anthony Jones
0caa8d383f
Bug 908503: Change to stagefright demuxer; r=cpearce
...
Bug 908503: Build config changes for libstagefright demuxer; r=glandium
Bug 908503: Remove Chrome demuxer; r=cpearce
Bug 908503: Add conversion to Annex B; r=cpearce
2014-05-22 14:42:39 +12:00
Robert O'Callahan
2e946b1671
Bug 1001320. Part 5: Use #pragma GCC visibility on B2G. r=glandium
...
--HG--
rename : config/gcc_hidden.h => config/gcc_hidden_dso_handle.h
2014-05-11 23:37:14 -07:00
Ryan VanderMeulen
f38af37ac7
Backed out changeset 8433a3609a54 (bug 1001320) for suspected B2G device image bustage.
...
CLOSED TREE
2014-05-20 12:17:51 -04:00
Robert O'Callahan
bd67ea930b
Bug 1001320. Part 5: Use #pragma GCC visibility on B2G. r=glandium
...
--HG--
rename : config/gcc_hidden.h => config/gcc_hidden_dso_handle.h
extra : rebase_source : 600bf9dd51c88ea0cdea3db2e20ce8ab1de9f3fb
2014-05-11 23:37:14 -07:00
Wes Kocher
e45f0bc2b5
Backed out 4 changesets (bug 908503) for breaking the Hamachi eng dep build on an otherwise CLOSED TREE
...
Backed out changeset 476cd5c9c5a9 (bug 908503)
Backed out changeset add95b3c2e7f (bug 908503)
Backed out changeset 30957caad928 (bug 908503)
Backed out changeset f6f386352d12 (bug 908503)
2014-05-12 21:18:31 -07:00
Anthony Jones
6c7d336536
Bug 908503: Build config changes for libstagefright demuxer; r=glandium
2014-05-13 14:53:54 +12:00
Mike Shal
a5bc198d83
Bug 943971 - 'make foo.i' should work for unified files; r=glandium
2013-12-11 19:23:24 -05:00
Makoto Kato
ece5a88ece
Bug 1008795 - Remove MOZ_ENABLE_MEEGOTOUCHSHARE. r=romaxa
2014-05-12 20:01:04 +09:00
Anthony Jones
0775db81b3
Backed out changeset 7f57690f5141 (bug 908503)
2014-05-12 10:11:03 +12:00
Anthony Jones
1b4ffc4277
Bug 908503: Build config changes for libstagefright demuxer; r=glandium
2014-05-12 09:46:31 +12:00
Nathan Froyd
04ee24d53f
Bug 1006026 - remove duplicate distclean:: rule in rules.mk; r=mshal
2014-05-07 10:33:06 -04:00
Robert O'Callahan
56a13e26e9
Bug 1001320. Address missed reivew comment. r=glandium
...
--HG--
extra : rebase_source : ed23c9ae7de0167a44068c03cfd9d32a52e358f6
2014-05-07 18:14:36 +12:00
Robert O'Callahan
1b9624ee99
Bug 1006248. Part 3: Add lots of system header wrappers for B2G/Android. r=glandium
...
--HG--
extra : rebase_source : 8ea21e177bf6f5ba7bb9d53c8f564b46e8b97cd6
2014-05-06 17:40:47 +12:00
Ehsan Akhgari
6f56f93285
Backed out changeset 70946e64e8f8 (bug 1005704) because it caused bug 1006541
2014-05-06 16:39:39 -04:00
Ehsan Akhgari
c5a9a76740
Bug 1005705 - Remove the unused DIST_CHROME_FILES rule; r=mshal
2014-05-05 21:26:32 -04:00
Ehsan Akhgari
b7cf2d4a14
Bug 1005704 - Enable installing files dist files without preprocessing; r=mshal
2014-05-05 21:26:11 -04:00
ffxbld
8714c49598
Version bump. CLOSED TREE NO BUG a=release
2014-04-28 14:18:37 -04:00
Trevor Saunders
ddf9480cc5
bug 998959 - remove xpt headers from system headers list r=bsmedberg
...
These headers were added with the initial support for hidden visibility
in bug 273336. At that time this code probably lived in libxpcom and needed to
be callable outside of that, but that's not true anymore. At this point not
linking this code into libxul seems like madness, so we
might as well stop calling them system headers so we stop exporting them
from libxul.
2014-04-21 10:48:45 -04:00
Jan Beich
ac960a4665
Bug 983953 - Don't try to use vpx_mem if --with-system-libvpx doesn't provide. r=glandium
2014-04-22 08:44:04 -04:00
Jeff Walden
8e3a6ac462
Bug 988619 - Fix bad includes bustage. r=njn over IRC to fix bustage in a CLOSED TREE
...
--HG--
rename : js/src/jit/ExecutionModeInlines.h => js/src/jit/ExecutionMode-inl.h
2014-04-14 18:26:15 -07:00
Tooru Fujisawa
8d898aff04
Bug 918987 - Implement String.prototype.normalize. r=jwalden
...
--HG--
extra : rebase_source : c634fd1961c1eb004bc4e0dd9ed26047abb285b4
2014-04-09 14:38:24 -07:00
Mike Hommey
d8715357c7
Bug 989522 - Remove LIBXUL_LIBRARY from the moz.build sandbox. r=mshal
2014-04-02 11:52:04 +09:00
Mike Hommey
edf4794405
Bug 988168 - Better integrate gtest libxul in the build system. r=mshal. DONTBUILD
...
--HG--
rename : toolkit/library/Makefile.in => toolkit/library/libxul.mk
rename : toolkit/library/moz.build => toolkit/library/libxul.mozbuild
2014-03-31 13:21:38 +02:00
Mike Hommey
3dbd6f1f57
Backed out changeset 561b9329d832 (bug 988168) for wrong attribution.
2014-04-01 13:17:50 +09:00
Jacek Caban
258449c186
Bug 988168 - Better integrate gtest libxul in the build system. r=mshal
...
--HG--
rename : toolkit/library/Makefile.in => toolkit/library/libxul.mk
rename : toolkit/library/moz.build => toolkit/library/libxul.mozbuild
2014-03-31 13:21:38 +02:00
Mike Hommey
b4ed5e9a80
Backout changesets ca413634eba3 and a92851ff7444 (bug 988168) for likely windows PGO perf regression
2014-03-29 16:49:19 +09:00
Mike Hommey
d55f8470ad
Bug 988168 - Better integrate gtest libxul in the build system. r=mshal
...
--HG--
rename : toolkit/library/Makefile.in => toolkit/library/libxul.mk
rename : toolkit/library/moz.build => toolkit/library/libxul.mozbuild
2014-03-29 07:50:08 +09:00
Mike Hommey
7b608e94e0
Bug 915535 - Fixup for Windows bustage on a CLOSED TREE. r=me
2014-03-27 11:16:45 +09:00
Mike Hommey
3b6079715c
Bug 988141 - Clean up config/recurse.mk after bug 969164. r=gps
2014-03-27 10:36:36 +09:00
Mike Hommey
73f5790186
Bug 915535 - Remove subtier tracking from build system. r=gps
...
It's currently inaccurate, and soon, the very notion of subtier is going to
blow away in the compile/binaries targets.
2014-03-27 10:36:25 +09:00
Mike Hommey
254ce5d027
Bug 915535 - Remove directory tracking from build system. r=gps
...
It's not used except with pymake, anyways.
2014-03-27 10:36:16 +09:00
Mike Hommey
8aba9ab7cf
Bug 985836 - Move -Fd flags from configure to config.mk. r=mshal
2014-03-26 08:12:26 +09:00
ABE Hiroki (hATrayflood)
6e30090928
Bug 980697 - Add a configure option to pull newer versions of the d3dcompiler dll from installed Windows SDKs. r=mshal,vlad
2014-03-22 10:49:26 +09:00
Mozilla Release Engineering
198567e0a0
Merging in version bump NO BUG CLOSED TREE DONTBUILD
2014-03-17 13:48:08 -07:00
Wes Kocher
93661497bd
Merge m-c to fx-team
2014-03-12 21:23:37 -07:00
Nick Alexander
28663ebee3
Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
...
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild. This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.
What appeared to be happening is the following:
Touch a resource. On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.
Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale. A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked. So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale. The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.
On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00
Ted Mielczarek
1e45b1eeae
Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps
2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
462d354cd5
Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures.
...
CLOSED TREE
2014-03-10 15:31:23 -04:00
Ted Mielczarek
4efe7d076c
Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps
...
--HG--
extra : rebase_source : 3825abc63eb0901bc1422aa00aed3680dbe3e44c
2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
9af7d7848c
Merge fx-team to m-c.
2014-03-05 15:49:40 -05:00
Robert Strong
e7817478d3
Bug 900251 - Add support for add-if-not instruction added by bug 759469 to the mar generation scripts. r=nthomas
2014-03-05 11:42:56 -08:00
Nick Alexander
3720d512ba
Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey
2014-03-05 08:57:09 -08:00
Ehsan Akhgari
bf09c6f469
Bug 976896 - Port STL_FLAGS to moz.build; r=mshal
2014-03-04 19:39:06 -05:00
Ehsan Akhgari
4bf31332f9
Bug 978594 - Part 2: Add support for expressing per-source build flags to moz.build; r=glandium
...
--HG--
extra : rebase_source : 254d8acf1a6a53845a2e2d6d895217515ea7b836
2014-03-04 11:30:01 -05:00
Mike Hommey
27a4bb82ef
Bug 977951 - Don't force build a static libxul. r=gps
2014-03-04 16:09:08 +09:00
Ehsan Akhgari
1fc88322b2
Fix a typo, no bug, DONTBUILD
2014-03-02 16:35:24 -05:00
Ms2ger
9d04b5cd6d
Bug 973649 - Add logic for CFLAGS, CXXFLAGS and LDFLAGS to moz.build; r=gps
...
--HG--
extra : amend_source : d44541fd844c1b3f5fb4077add7aa0589ae61942
2014-02-26 12:49:00 -08:00
Mike Hommey
b026c3cc67
Bug 976853 - Exclude dependency file from dependency output for expandlibs_exec.py; r=gps
...
--HG--
extra : amend_source : d7f26ca852a9013d031fe752cd3ae5d8d6ad1414
2014-02-26 13:55:36 +09:00
Jan Beich
c11715cea2
Bug 962345 - Unhide cairo_qt_surface_*() when building with --enable-system-cairo. r=glandium
2014-02-25 15:55:26 -05:00
Ryan VanderMeulen
917a319f58
Merge m-c to inbound.
2014-02-25 15:28:35 -05:00
Nick Alexander
1fd81b5538
Bug 903528 - Follow-up: Fix build dependencies. a=bustage
...
The issue is that the preprocessed files need to be referenced as
$(CURDIR)/file to have Make handle the dependencies correctly. To
allow this, this patch adds ANDROID_MANIFEST_FILE (defaulting to
AndroidManifest.xml) and uses it in the appropriate places.
2014-02-24 23:18:47 -08:00
Nick Alexander
0d131e80d7
Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium
2014-02-24 18:24:45 -08:00
Ralph Giles
5080040b8e
Bug 964559 - Remove MOZ_OGG. r=doublec,ted
...
We are unable to maintain all the --disable-foo build-time options
for the media code. Just support ogg unconditionally.
2014-02-20 18:01:00 -08:00
Ehsan Akhgari
180500a2bb
Bug 974216 - Set LIBXUL_LIBRARY for LIBRARY_NAME==xul; r=glandium
2014-02-18 22:20:51 -05:00
Ehsan Akhgari
7b16802ce4
Bug 973142 - Get rid of the MOZILLA_INTERNAL_API makefile variable; r=glandium
...
It's just as easy to directly set the preprocessor macro in the moz.build
files. Using this variable doesn't really buy us anything.
This patch also removes unused code from rdf/tests/dsds.
2014-02-18 01:56:51 -05:00
Nick Alexander
ec132ddcf5
Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
...
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.
--HG--
extra : rebase_source : a090d707579711f85b8f9f174b88bf9302be0b24
2014-02-11 09:55:47 -08:00
Brian O'Keefe
82d30a00dd
Bug 772828 - Part a: add support for RESOURCE_FILES in moz.build; r=mshal
2013-11-05 13:37:49 -05:00
Ryan VanderMeulen
f46afed6ea
Backed out changesets 6948901b128f and d9a099b06911 (bug 946083) and changeset 1e038f308b8d (bug 961339) for intermittent Android build failures.
2014-02-11 09:35:12 -05:00
Nick Alexander
d848739427
Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
...
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.
2014-02-10 21:43:00 -08:00
Nick Alexander
01e16e28ef
Bug 961339 - Fix generated/ source dependencies. r=glandium
...
Generated sources are listed like 'generated/FILE.java'. Generated
sources are produced by PP_TARGETS, which generates the file
'$(CURDIR)/generated/FILE.java'. Because Make interprets $(CURDIR)/foo
and foo differently, this means we need to depend on $(CURDIR)/* for all
generated sources. Since R.java is both listed as a generated source,
but produced by aapt, we need any dependencies to be on
$(CURDIR)/.../R.java.
The change to java-build.mk includes $(CURDIR) in the dependencies for
generated sources. The changes to Makefile.in includes $(CURDIR) in the
produced R.java files for Make.
2014-02-10 21:43:00 -08:00
Mike Hommey
082475052b
Bug 969164 - Replace most BUILDING_JS uses with JS_STANDALONE. r=gps
...
Before making top-level traverse js/src moz.build files, there was a need to
distinguish between top-level traversing e.g. top-level moz.build or
config/moz.build and js/src traversing them. With a single traversal of both
moz.build sets, we now only need to distinguish between js standalone builds
and gecko builds.
There is still, however, a need to distinguish between top-level vs. js/src
configure runs on gecko builds to make them subconfigure icu and libffi from
top-level instead of js/src in js standalone builds, or when choosing to make
js/src's config.status do something when run or not.
2014-02-11 10:37:47 +09:00
Mike Hommey
0d839c5b66
Bug 969164 - Traverse js/src moz.builds from top-level configure. r=gps
...
Before, we would run configure in both top-level and js/src, and both
configures would traverse their own set of moz.builds, without actual
knowledge about the other. With this change, both configures still run,
but only top-level traverses moz.build files, and uses js/src's
config.status when traversing its moz.build files. This allows a better
sharing of information between both build systems and the removal of many
hacks.
This also moves running libffi and icu configure to top-level.
Standalone js builds still have their own configure doing moz.build traversal,
as before.
--HG--
rename : config/autoconf.mk.in => config/autoconf-js.mk.in
rename : config/emptyvars.mk.in => config/emptyvars-js.mk.in
2014-02-11 10:37:47 +09:00
EKR
aa641b6b8c
Bug 970476 - Re-add CPP unit test target. r=ted
2014-02-10 11:42:19 -08:00
Ehsan Akhgari
b870bb3fe9
Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg
2014-02-10 17:57:01 -05:00
Ehsan Akhgari
ac38419e37
Bug 944800 - Move the information about delay loaded DLLs into moz.build; r=gps
2014-02-06 14:17:44 -05:00
Mike Hommey
4157deef12
Bug 959519 - Keep timestamps when copying files with nsinstall.py while nsinstall is not ready to be used yet. r=gps
2014-02-05 13:02:20 +09:00
Ehsan Akhgari
31e7cec189
Backed out changeset b54e8c328c32 (bug 944800) because of test failures on a CLOSED TREE
2014-02-04 17:03:17 -05:00
Ehsan Akhgari
cf46d0e8c5
Bug 944800 - Move the information about delay loaded DLLs into moz.build; r=gps
...
--HG--
extra : rebase_source : 3eca29dae04c42fa8e7d113318b8a169a0cf22e4
2014-02-04 13:57:34 -05:00
Lukas Blakk
bb6781d1b1
Merging in version bump NO BUG CLOSED TREE
2014-02-03 15:03:10 -08:00
Randy Lin
6a6aa3a1ea
Bug 891705 - [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps, r=rillian
...
This is an integrated patch which includes:
1. Bug 891705: [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps
2. Bug 950567: [MediaEncoder] Phase-in libmkv library. r=giles
3. bug 883749: Implement Vorbis encoding. r=rillian
4. bug 881840: Implement VP8 track encoder. r=rillian
2014-01-15 14:21:14 +08:00
Jeff Walden
a6df7a3e57
Bug 963434 - Remove jsopcode.tbl and jsoplengen.cpp in favor of a higher-order macro, and make JSOP_*_LENGTH into C++ constant variables. This will make the build process simpler, and it likely eliminates a needs-CLOBBER situation encountered while landing bug 948583. Particular thanks to r=jorendorff for the fast review here (given any change at all to jsopcode.tbl would bitrot this), DONTBUILD because already landed with wrong bug number
2014-01-24 13:21:09 -08:00
Jeff Walden
c23ca4b51a
Backed out changeset fe06fb5e10a7, wrong bug number.
...
--HG--
extra : rebase_source : fad89601b11e3a6cf19114b2152fa3c62d05cce4
2014-01-24 15:00:52 -08:00
Jeff Walden
6bee3b5ae5
Bug 963634 - Remove jsopcode.tbl and jsoplengen.cpp in favor of a higher-order macro, and make JSOP_*_LENGTH into C++ constant variables. This will make the build process simpler, and it likely eliminates a needs-CLOBBER situation encountered while landing bug 948583. Particular thanks to r=jorendorff for the fast review here (given any change at all to jsopcode.tbl would bitrot this)
...
--HG--
extra : rebase_source : 4f5956dd196ff894766210cc4c9629054fc2914d
2014-01-24 13:21:09 -08:00
Sylvestre Ledru
f854b0dc6b
Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps
2014-01-23 09:38:29 -05:00
Jan Beich
9ca889d0ac
Bug 961816 - Unhide _Unwind_Backtrace() as needed by NS_StackWalk(). r=glandium
2014-01-21 11:40:21 -05:00
Mike Hommey
f7fb7254c8
Bug 958404 - Use tiers for js build. r=gps
2014-01-20 09:11:37 +09:00
Mike Hommey
3b9965d800
Bug 959508 - Remove EXTERNALLY_MANAGED_MAKE_FILE traversal. r=gps
2014-01-20 09:10:33 +09:00
Mike Hommey
737f05c75c
Bug 944650 - Allow mach to use a pristine GNU make if present and supported. r=gps
2014-01-20 09:09:56 +09:00
Mike Hommey
d3597cdd9b
Bug 956398 - Error out at build time if we end up with text relocations. r=ted
2014-01-16 09:13:43 +09:00
Mike Hommey
925edbca14
Bug 950298 - Make the js build system use top-level as its root objdir. r=gps
2014-01-14 07:38:40 +09:00
Mike Hommey
a2fe974531
Bug 957919 - Remove config/asencode.cpp. r=ted
2014-01-14 07:31:30 +09:00
Dan Minor
c94e429899
Bug 949536 - Remove cpp unittests from 'make check'; r=gps
2014-01-09 21:59:28 -08:00
Masatoshi Kimura
af2eb9b1af
Bug 948405 - Define a dummy environment variable to ensure that the build system will not choke with non-ASCII characters. r=gps
2014-01-07 07:58:30 +09:00
Gregory Szorc
158ed8b3ec
Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium
...
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.
We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.
--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2013-12-10 16:18:11 +09:00