AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
26,432 Commits 1 Branch 0 Tags 544 MiB
52bab3047b
Commit Graph

392 Commits

Author SHA1 Message Date
stephana
c60b310af7 Modify iOSShell-gyp to generate unique bundle identifier 
BUG=skia:

Review URL: https://codereview.chromium.org/1483143002
 2015-12-02 09:45:30 -08:00
joshualitt
43f610f693 Parse command line arguments for sdl + android 
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/1432983002
 2015-11-10 08:27:22 -08:00
joshualitt
01f4a9e7bf Fixes for building with sdl on android 
BUG=skia:
TBR=bsalomon@google.com

Review URL: https://codereview.chromium.org/1437613002
 2015-11-10 07:36:18 -08:00
msarett
b747b90501 Remove dependencies on Android's forked decoder libraries 
Disable SkImageDecoder's code which relies on Android's customized
libpng and libjpeg. Build standard versions of libpng and libjpeg-turbo
everywhere. The SkImageDecoder code has been replaced with SkCodec, which
can decode subsets using standard library APIs

BUG=skia:

Review URL: https://codereview.chromium.org/1406153015
 2015-11-06 11:15:49 -08:00
joshualitt
474a9ea051 Wire up SDL on Android 
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/a4d3797c3b0f0cac8493c46cb334ca88a5d6ccf6

Review URL: https://codereview.chromium.org/1415453009
 2015-11-05 11:49:35 -08:00
joshualitt
5d7a7fe563 Revert of Wire up SDL on Android (patchset #4 id:60001 of https://codereview.chromium.org/1415453009/ ) 
Reason for revert:
breaks appurify

Original issue's description:
> Wire up SDL on Android
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/a4d3797c3b0f0cac8493c46cb334ca88a5d6ccf6

TBR=bsalomon@google.com,robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1410703009
 2015-11-05 10:48:41 -08:00
joshualitt
a4d3797c3b Wire up SDL on Android 
BUG=skia:

Review URL: https://codereview.chromium.org/1415453009
 2015-11-05 08:35:31 -08:00
joshualitt
6db78d74fa Fix visualbench exiting on startup on android 
BUG=skia:

Review URL: https://codereview.chromium.org/1416123003
 2015-10-26 12:00:42 -07:00
jvanverth
338047e21f Clean up iOS build files 
Review URL: https://codereview.chromium.org/1409663002
 2015-10-15 13:20:35 -07:00
mtklein
e14937e7c4 Update Android toolchains and streamline process. 
- This updates to r10e / API v21 everywhere.
  - This has each host machine fetch the NDK,
    run make-standalone-toolchain.sh, and copy gdbserver itself.

(It will do all this once per $ARCH, which is a little inefficient, but it
washes out in steady state.)

BUG=skia:

Review URL: https://codereview.chromium.org/1385463002
 2015-10-01 13:24:23 -07:00
halcanary
ab26a9b427 android/apps: Add CanvasProof App; 
Compare Ganesh and HWUI canvas rendering of SKPs on android.

Put SKP files in .../canvasproof/src/main/assets/skps

Run on a Marshmallow device.

NOTREECHECKS=true

Review URL: https://codereview.chromium.org/1258123004
 2015-09-23 12:40:34 -07:00
borenet
ad54ffc235 adb_wait_for_device: Skip adb wait-for-device 
This should still wait for the device to be attached and finished
booting, but will prevent no-output timeouts due to
`adb wait-for-device` never finishing.

The effect should be that, when an Android device is disconnected, the
"wait for device" step will run forever, or until the device
reconnects. This should prevent a disconnected device from spreading
purple all over the status page.

BUG=skia:

Review URL: https://codereview.chromium.org/1315753010
 2015-09-03 10:41:07 -07:00
borenet
e5a38f0ad2 VisualBenchTest: Read nanobench_flags.txt 
BUG=skia:4093

Review URL: https://codereview.chromium.org/1314873005
 2015-09-02 06:04:29 -07:00
borenet
5e04bcfddd Run Appurify bot in release mode 
BUG=skia:4093

Review URL: https://codereview.chromium.org/1306953006
 2015-08-31 09:30:57 -07:00
borenet
89971d4537 Use a different download URL for Android toolchains 
The current one isn't working on the Appurify bot

BUG=skia:4093

Review URL: https://codereview.chromium.org/1311533006
 2015-08-31 08:35:32 -07:00
halcanary
96fcdcc219 Style Change: NULL->nullptr 
DOCS_PREVIEW= https://skia.org/?cl=1316233002

Review URL: https://codereview.chromium.org/1316233002
 2015-08-27 07:41:16 -07:00
halcanary
385fe4d4b6 Style Change: SkNEW->new; SkDELETE->delete 
DOCS_PREVIEW= https://skia.org/?cl=1316123003

Review URL: https://codereview.chromium.org/1316123003
 2015-08-26 13:07:49 -07:00
borenet
877a52ae61 VisualBenchTest: Write JSON output 
BUG=skia:4093

Review URL: https://codereview.chromium.org/1302103002
 2015-08-20 09:12:39 -07:00
borenet
e5e6c6069f Add VisualBenchTestActivity for instrumentation-testing VisualBench 
BUG=skia:4093

Review URL: https://codereview.chromium.org/1295823004
 2015-08-19 12:06:47 -07:00
msarett
3011711d5d Revert of Update skia to test with libpng to 1.6.10 (patchset #3 id:60001 of https://codereview.chromium.org/1301523005/ ) 
Reason for revert:
DM is failing on gm tests on Android bots.  Cause is not yet clear.

Original issue's description:
> Update skia to test with libpng to 1.6.10
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118

TBR=djsollen@google.com,scroggo@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1298223002
 2015-08-18 11:36:44 -07:00
msarett
f272bb03df Update skia to test with libpng to 1.6.10 
BUG=skia:

Review URL: https://codereview.chromium.org/1301523005
 2015-08-18 10:46:01 -07:00
msarett
fcaaadee71 Switching Skia to chromium's libjpeg-turbo 
Compile SkJpegCodec and SkImageDecoder_libjpeg with
chromium's libjpeg-turbo.  SkImageDecoder_libjpeg still uses
libjpeg on Android and the Android framework.  SkJpegCodec is
still not compiled on the Android framework.

BUG=skia:

Review URL: https://codereview.chromium.org/1275773004
 2015-08-11 13:32:54 -07:00
djsollen
3a26fc8e9a Ensure that android "release" apps are signed with debug key 
Review URL: https://codereview.chromium.org/1275223003
 2015-08-10 08:58:04 -07:00
djsollen
5119ac069e Update Android Testing apps to support release mode 
BUG=skia:4152

Review URL: https://codereview.chromium.org/1259123003
 2015-07-31 10:25:17 -07:00
bungeman
15bde1697a Fix repeat builds with Android. 
Currently the SampleApp and VisualBench builds for Android don't work
for rebuilds. The code is re-built, but the apks are not. This
results from the use of a directory as 'output' and the action to
build the apk not depending on the copied libraries.

Review URL: https://codereview.chromium.org/1270643005
 2015-07-31 06:33:21 -07:00
borenet
850bbf1bb6 Add android_run_app.go 
Launches an app, pipes its output, and exits when the app exits.

Loosely based on the old buildbot code in python:
https://skia.googlesource.com/buildbot/+/ac0663c599a443a4958c8cad5aefd25eb09eff58/slave/skia_slave_scripts/utils/android_utils.py

BUG=skia:4093

Review URL: https://codereview.chromium.org/1256353002
 2015-07-31 04:13:38 -07:00
borenet
b2c07364a3 Fix android_launch_app after Gradle change 
NOTRY=true
TBR=djsollen
BUG=skia:

Review URL: https://codereview.chromium.org/1258253002
 2015-07-28 06:00:36 -07:00
borenet
5f4dc38325 android_install_app: Use lower-cased app name 
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1261873002
 2015-07-28 05:13:41 -07:00
Brian Salomon
4239fc2f69 Remove skia_arch_width, fold into skia_arch_type. 
DOCS_PREVIEW= https://skia.org/?cl=1228553010

BUG=skia:4042
R=borenet@google.com, mtklein@google.com

Review URL: https://codereview.chromium.org/1228553010
 2015-07-27 09:10:36 -04:00
djsollen
d18b861061 Update Android Apps to use gradle 
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Committed: https://skia.googlesource.com/skia/+/425535f1626932e4e22f61a2571f9c3c2b1c5977

Review URL: https://codereview.chromium.org/1215023017
 2015-07-24 13:15:59 -07:00
joshualitt
9efef7b56f Revert "Update Android Apps to use gradle" 
This reverts commit 425535f162.

NOTRY=true
NOTREECHECKS=true
TBR=djsollen@google.com
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1250233002

Review URL: https://codereview.chromium.org/1250233002
 2015-07-23 08:00:33 -07:00
djsollen
425535f162 Update Android Apps to use gradle 
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Review URL: https://codereview.chromium.org/1215023017
 2015-07-22 11:33:25 -07:00
msarett
cf2a6a47e4 Reenable yasm for Android x86 and x86-64 on Linux host 
It turns out that gyp (kind of) has support for cross
compiling with a different host and target.  We simply
need to specify CC_host and CC_target instead of CC.

Making this change allows us to compile yasm on a Linux
host for Android.

We run into problems on Mac because
the linker on a Mac host requires different command line
arguments than the linker on the Android target.  In
looking through the code for gyp itself and speaking to
Ben, it doesn't appear to me that gyp supports passing
different arguments to host and target linkers.

I would imagine that we would have similar problems on
Windows.

Below is a link to a CL that would fix this issue in gyp.
It looks like it has been dropped for a long time.
Thanks to Ben for this link!
https://chromiumcodereview.appspot.com/10795044/

Also I'm adding a link to the build instructions for Chrome
(thanks again Ben).  It looks like they only support
building for Android from Linux.
https://code.google.com/p/chromium/wiki/AndroidBuildInstructions

My next steps are:
1) Getting in touch with Torne or someone else with gyp to
see if people are aware of this issue or interested in
fixing it.
2) Deciding if skia should care about this issue.
3) Deciding if skia should work around this issue.

It'd be really great to hear your thoughts on (2) and (3).
My first thought is that we shouldn't care because, as
long as we always compile the production copy of skia for
Android on Linux, we will get the fast code.  Is this
a valid conclusion?  Is there a way to write Android apps
on Mac that accidentally use the slower code?

If we do care, there are workarounds:
For Mac, we can check in a yasm binary - it's a little
smaller than the one I am deleting in this CL :-/
For Windows, we *might* be able to use the yasm.exe binary
already in externals (we get this from DEPS because this is
how chromium uses yasm on Windows).
Are there other platforms that we care about?

Let me know what you think!

BUG=skia:4028
DOCS_PREVIEW= https://skia.org/?cl=1239333002

Review URL: https://codereview.chromium.org/1239333002
 2015-07-21 12:01:48 -07:00
joshualitt
dcd56e2f0e Fix for android command line arguments to VisualBench 
BUG=skia:

Review URL: https://codereview.chromium.org/1241923002
 2015-07-15 10:17:21 -07:00
scroggo
33d35263bf Move android_gdb_tmp into out/ 
This way it will be ignored.

Review URL: https://codereview.chromium.org/1230773003
 2015-07-10 11:05:10 -07:00
scroggo
139491fbaa Use the upstream version of libwebp, v0.4.3. 
DEPS:
Update to pull v0.4.3 of libwebp from upstream

gyp/libwebp.gyp:
Add new files, as referenced by the gyp file used by Chromium.

resource/tests:
Add regression tests for particular images.

BUG=skia:3442
BUG=skia:3315
BUG=skia:3429

Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1

Review URL: https://codereview.chromium.org/1178013008
 2015-07-10 09:32:09 -07:00
djsollen
8de81806db Add gradle wrappers for Android app builds 
These wrappers are approxiately 56K in size and are the recommened
way to use Gradle.  It also ensures that developers wanting to
build the app don't need install an additional dependency.

Review URL: https://codereview.chromium.org/1227723002
 2015-07-08 10:50:42 -07:00
joshualitt
91b6f32e07 Move visualbench to its own folder 
BUG=skia:

Review URL: https://codereview.chromium.org/1216973002
 2015-06-30 06:50:10 -07:00
djsollen
4e7956147d Android scripts now notify gyp that your building with clang 
Review URL: https://codereview.chromium.org/1217443004
 2015-06-26 11:03:56 -07:00
joshualitt
fef3fad272 fix spurious init on VisualBench startup 
BUG=skia:

Review URL: https://codereview.chromium.org/1202023002
 2015-06-22 10:44:46 -07:00
joshualitt
01f38915e1 Fixup android launch script to launch VisualBench as well as SampleApp 
BUG=skia:

Review URL: https://codereview.chromium.org/1185473003
 2015-06-22 05:39:32 -07:00
joshualitt
b7134b64c6 Fix for assert in VisualBench 
BUG=skia:

Review URL: https://codereview.chromium.org/1198433004
 2015-06-19 12:46:33 -07:00
joshualitt
74953c388c Modify android_install_app to install VisualBench 
BUG=skia:

Review URL: https://codereview.chromium.org/1181973008
 2015-06-18 13:08:26 -07:00
msarett
b3ec76b34f Update android perf script 
BUG=skia:

Review URL: https://codereview.chromium.org/1185293006
 2015-06-18 06:29:48 -07:00
joshualitt
030dc847dc Visual bench on native android 
BUG=skia:

Review URL: https://codereview.chromium.org/1164403002
 2015-06-12 12:51:44 -07:00
djsollen
f793cd0913 Print command to be executed in verbose mode 
Review URL: https://codereview.chromium.org/1180163002
 2015-06-12 10:50:53 -07:00
msarett
78d79cc575 Eliminate the check for ANDROID_LARGE_MEMORY in jpeg decoders 
BUG=skia:1282

Review URL: https://codereview.chromium.org/1103313002
 2015-06-11 10:13:03 -07:00
Derek Sollenberger
de50d9b942 fix broken build by not passing the verbose flag through 
Review URL: https://codereview.chromium.org/1176543004
 2015-06-10 15:58:48 -04:00
djsollen
46409de6ab Remove verbose bash logging 
Review URL: https://codereview.chromium.org/1170283004
 2015-06-10 12:37:56 -07:00
joshualitt
cf94c74fef Add android native_app_glue to platform_tools/android/third_party 
BUG=skia:

Review URL: https://codereview.chromium.org/1175673002
 2015-06-09 12:33:13 -07:00
djsollen
fe79007a13 Update how we package skia resource for android testing 
Review URL: https://codereview.chromium.org/1119283004
 2015-06-05 09:39:30 -07:00
borenet
5aa5ea3831 Add adb_wait_for_device script 
BUG=skia:3718

Review URL: https://codereview.chromium.org/1149163003
 2015-06-02 12:38:16 -07:00
stephana
c9b8276bc9 BUG=skia: 
NOTRY=true
TBR=borenet

Review URL: https://codereview.chromium.org/1153783003
 2015-05-22 10:55:33 -07:00
stephana
c13a7738fb Unmount before app-install 
TBR=borenet

NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1145093005
 2015-05-20 07:31:32 -07:00
stephana
9b4b91f5c2 This allows to restart the device. 
BUG=skia:
TBR=borenet

Review URL: https://codereview.chromium.org/1137873007
 2015-05-19 06:27:09 -07:00
stephana
4f2dba625d Making mount more robust 
BUG=skia:
TBR=borenet

Review URL: https://codereview.chromium.org/1131933007
 2015-05-18 13:50:05 -07:00
borenet
7ae68a8f8d Android scripts: add --verbose, fix missing 'source android_setup' 
BUG=skia:3836
TBR=djsollen

Review URL: https://codereview.chromium.org/1145473002
 2015-05-14 06:37:23 -07:00
Derek Sollenberger
7c722197b3 Add android_launch_app script to allow command line options to be passed to the sampleApp when starting. 
BUG=skia:3815
DOCS_PREVIEW= https://skia.org/?cl=1136753003
R=bungeman@google.com, tomhudson@google.com

Review URL: https://codereview.chromium.org/1136753003
 2015-05-11 08:54:19 -04:00
bungeman
4a8d622e1d Add default resourcePath to SampleApp on Android. 
Currently SampleApp on Android cannot find resources. This sets the
resourcePath to /data/local/tmp/skia/resources/ which is the path
used in documentationo. A future change will allow this default to be
overridden.

BUG=skia:3815

Review URL: https://codereview.chromium.org/1125363004
 2015-05-07 10:57:02 -07:00
stephana
deee2980f4 cleanup 
BUG=skia:

Review URL: https://codereview.chromium.org/1085583006
 2015-05-05 07:55:06 -07:00
borenet
f15132fdcf Support SKIA_OUT on Mac and ChromeOS 
BUG=skia:3774

Review URL: https://codereview.chromium.org/1122593003
 2015-05-04 08:04:28 -07:00
msarett
a3a8eb6f63 Make Skia for Android libjpeg use ashmem 
BUG=skia:1282

Review URL: https://codereview.chromium.org/1108013002
 2015-04-27 10:57:22 -07:00
mtklein
5ae0e2b563 Default to arm_v7_neon. 
This aliases all devices we know have NEON over to that too.

BUG=skia:

Review URL: https://codereview.chromium.org/1095953007
 2015-04-21 14:25:34 -07:00
mtklein
d8afd50b5a Android's Clang toolchain can't assemble the JPEG's .S files. 
Only affecting Build-Mac10.8-Clang-Arm7-Debug-Android.

BUG=skia:

Review URL: https://codereview.chromium.org/1093423003
 2015-04-21 12:07:38 -07:00
stephana
cdec56e72b Landing directly for testing the ios buildbot code. 
BUG=skia:
TBR=borenet

Review URL: https://codereview.chromium.org/1087653005
 2015-04-21 08:31:59 -07:00
Derek Sollenberger
a0219f1565 Fail gracefully when dm.json is not present 
Review URL: https://codereview.chromium.org/1073593002
 2015-04-08 15:20:25 -04:00
mtklein
ac813d8a12 Try ARMv7 and NEON for Daisy. 
I think Daisy's color order problems are in non-NEON ARM assembly.
NEON might actually be fine.

BUG=skia:1843

Committed: https://skia.googlesource.com/skia/+/a121c0ee6b911dd7004c6054a8692d37084b6b3d

CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android_Neon-Trybot,Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot,Build-Ubuntu-GCC-Arm64-Debug-Android-Trybot

Review URL: https://codereview.chromium.org/1054233002
 2015-04-03 08:27:37 -07:00
mtklein
fb806dd27d Revert of Try ARMv7 and NEON for Daisy. (patchset #1 id:1 of https://codereview.chromium.org/1054233002/) 
Reason for revert:
whatever compiler we're using can't handle array subscripts for neon vectors

Original issue's description:
> Try ARMv7 and NEON for Daisy.
>
> I think Daisy's color order problems are in non-NEON ARM assembly.
> NEON might actually be fine.
>
> BUG=skia:1843
>
> Committed: https://skia.googlesource.com/skia/+/a121c0ee6b911dd7004c6054a8692d37084b6b3d

TBR=mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:1843

Review URL: https://codereview.chromium.org/1058173002
 2015-04-02 15:41:25 -07:00
Mike Klein
a121c0ee6b Try ARMv7 and NEON for Daisy. 
I think Daisy's color order problems are in non-NEON ARM assembly.
NEON might actually be fine.

BUG=skia:1843

Review URL: https://codereview.chromium.org/1054233002
 2015-04-02 18:32:54 -04:00
Mike Klein
a41699271f back to plain arm for the night 
It's looking like the previous CL did not fix the Daisy bot GMs,
even though that's still the only bit of code I can find that was
ignoring color order.  Puzzled.  Reverting arm_version=7 for now.

BUG=skia:1843

Review URL: https://codereview.chromium.org/1051423002
 2015-04-02 17:35:25 -04:00
borenet
4808757d7a Remove all code related to NaCl 
BUG=skia:3600
DOCS_PREVIEW= https://skia.org/?cl=1036283002

Review URL: https://codereview.chromium.org/1036283002
 2015-04-02 12:16:36 -07:00
mtklein
2d33a1d0b0 Streamline Thumb config. 
Enable Thumb2 iff ARM v7.  (We don't turn it on today for ARM <v7, and ARM v8 doesn't support it.)

BUG=skia:

Review URL: https://codereview.chromium.org/1054993002
 2015-04-02 10:47:57 -07:00
mtklein
83c6459228 Make Daisy ARMv7. 
This should be a ~noop as far as gold.skia.org goes.
After this, I'll try out NEON.

BUG=skia:1843

Review URL: https://codereview.chromium.org/1056793004
 2015-04-02 10:24:23 -07:00
mtklein
cb49c07b73 tidy up chromeos_setup.sh 
- remove unused alex
- streamline Link's config
- remove misleading Daisy config:
  1) armv7=1 does nothing.  We meant to type arm_version=7 here.
  2) arm_neon=1 does nothing unless arm_version == 7.
  3) arm_thumb=0 is the default when arm_version <= 7.
  4) skia_arch_width=32 is the default when skia_arch_type=arm.

I'd just fix this to make Daisy arm_version=7 and arm_neon=1 (and
arm_thumb=1, which I'm going to separately make the default for
arm_version=7), but there are known color-order bugs with our
NEON procs that would make Daisy start pushing bad images to
Gold.  Going to take baby steps here...

BUG=skia:1843

Committed: https://skia.googlesource.com/skia/+/3c2809bc612f4a265770914f860d214c9665dc4a

CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy-Trybot

Review URL: https://codereview.chromium.org/1051253002
 2015-04-02 09:27:57 -07:00
mtklein
192945e92e Revert of tidy up chromeos_setup.sh (patchset #1 id:1 of https://codereview.chromium.org/1051253002/) 
Reason for revert:
arm_thumb not defined

Original issue's description:
> tidy up chromeos_setup.sh
>
> - remove unused alex
> - streamline Link's config
> - remove misleading Daisy config:
>   1) armv7=1 does nothing.  We meant to type arm_version=7 here.
>   2) arm_neon=1 does nothing unless arm_version == 7.
>   3) arm_thumb=0 is the default when arm_version <= 7.
>   4) skia_arch_width=32 is the default when skia_arch_type=arm.
>
> I'd just fix this to make Daisy arm_version=7 and arm_neon=1 (and
> arm_thumb=1, which I'm going to separately make the default for
> arm_version=7), but there are known color-order bugs with our
> NEON procs that would make Daisy start pushing bad images to
> Gold.  Going to take baby steps here...
>
> BUG=skia:1843
>
> Committed: https://skia.googlesource.com/skia/+/3c2809bc612f4a265770914f860d214c9665dc4a

TBR=borenet@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:1843

Review URL: https://codereview.chromium.org/1059443002
 2015-04-02 09:02:12 -07:00
mtklein
3c2809bc61 tidy up chromeos_setup.sh 
- remove unused alex
- streamline Link's config
- remove misleading Daisy config:
  1) armv7=1 does nothing.  We meant to type arm_version=7 here.
  2) arm_neon=1 does nothing unless arm_version == 7.
  3) arm_thumb=0 is the default when arm_version <= 7.
  4) skia_arch_width=32 is the default when skia_arch_type=arm.

I'd just fix this to make Daisy arm_version=7 and arm_neon=1 (and
arm_thumb=1, which I'm going to separately make the default for
arm_version=7), but there are known color-order bugs with our
NEON procs that would make Daisy start pushing bad images to
Gold.  Going to take baby steps here...

BUG=skia:1843

Review URL: https://codereview.chromium.org/1051253002
 2015-04-02 08:52:36 -07:00
djsollen
48c3534541 Update the Android scripts to refresh device names and capabilities. 
Review URL: https://codereview.chromium.org/1054633002
 2015-04-01 12:15:39 -07:00
msarett
6d0e7b2031 WIP: Added support for giflib, updated jpeg and png 
BUG=skia:3257

Committed: https://skia.googlesource.com/skia/+/255dcd11992ebe74eb54202c48cf5394d33a8ce6

Review URL: https://codereview.chromium.org/1038863003
 2015-03-30 07:52:52 -07:00
borenet
00c95098c3 Revert of WIP: Added support for giflib, updated jpeg and png (patchset #8 id:260001 of https://codereview.chromium.org/1038863003/) 
Reason for revert:
Trying out revert to see if it fixes Android bots.

Original issue's description:
> WIP: Added support for giflib, updated jpeg and png
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/255dcd11992ebe74eb54202c48cf5394d33a8ce6

TBR=djsollen@google.com,scroggo@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257

Review URL: https://codereview.chromium.org/1048713003
 2015-03-30 05:51:49 -07:00
msarett
255dcd1199 WIP: Added support for giflib, updated jpeg and png 
BUG=skia:3257

Review URL: https://codereview.chromium.org/1038863003
 2015-03-27 12:17:00 -07:00
msarett
114912d4b9 Fix android_run_skia script to allow for larger blacklist 
BUG=skia:

Review URL: https://codereview.chromium.org/1011653004
 2015-03-25 12:28:33 -07:00
djsollen
7bdc8dfaab Add custom dm upload script to be used by the android framework 
Review URL: https://codereview.chromium.org/979153002
 2015-03-05 09:13:58 -08:00
djsollen
f056bd1e01 Ensure that skia's test resources are properly packaged on Android 
Review URL: https://codereview.chromium.org/949853003
 2015-02-23 12:37:32 -08:00
djsollen
176cd92a61 Allow either the old or new version of ADB on mac. 
Review URL: https://codereview.chromium.org/926003002
 2015-02-19 18:39:40 -08:00
mtklein
8bce2449e7 set skia_arch_type in nacl_make 
BUG=skia:

Review URL: https://codereview.chromium.org/914413003
 2015-02-12 11:34:09 -08:00
scroggo
df1c3373fc Don't use m32 cflag for x86_64. 
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.

Except when we specifically want x86.

Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.

In gyp_to_android.py, create a separate var_dict for x86_64.

BUG=skia:3419

Review URL: https://codereview.chromium.org/916113002
 2015-02-12 10:48:25 -08:00
scroggo
9d7ceca350 Generated makefile now includes people to contact. 
Review URL: https://codereview.chromium.org/917913004
 2015-02-12 08:20:40 -08:00
bungeman
eb2be7fa44 Additional cleanups to Android config parsing. 
Properly labels several methods as static.
Use XML_GetBuffer to avoid an extra copy.
Set the memory allocators to Skia's.
Set define in 'defines' instead of cflags.
Update debug dumper.

Review URL: https://codereview.chromium.org/915443002
 2015-02-10 07:51:12 -08:00
djsollen
6429fd1e41 Cleanup the android scripts. 
Rename a few files to make their function clearer.
Update other files to remove dead code or improve function.

Review URL: https://codereview.chromium.org/865943007
 2015-02-03 15:07:30 -08:00
mtklein
2d63859f6f android_run_skia: dump logcat on failure 
logcat -c clears the log before we run.
logcat -d dumps the log stdout and exits.

BUG=skia:

Review URL: https://codereview.chromium.org/870643002
 2015-01-22 10:43:34 -08:00
djsollen
eae7fc09c6 Update the version of cpu-features that we use for testing. 
Review URL: https://codereview.chromium.org/858233003
 2015-01-21 12:11:00 -08:00
mtklein
a092d2eaf8 Remove another GM reference. 
This should make the android self-tests start passing again.
Rebaselined with:
  $ python makefile_writer_tests.py --rebaseline

BUG=skia:

Review URL: https://codereview.chromium.org/860333004
 2015-01-21 08:48:03 -08:00
scroggo
8fd8d38626 Add ability to specify gyp dir to gyp_to_android. 
When running gyp_to_android inside a Skia tree, it uses the gyp program
in third_party/externals. Inside an Android tree, we need to use a
different location for gyp (the Android copy of Skia, in external/skia,
does not contain third_party/externals).

The bot handles this by importing gyp_to_android and running its main
function directly.

Add command line arguments so a human can directly run gyp_to_android.

Review URL: https://codereview.chromium.org/864503002
 2015-01-20 10:39:25 -08:00
scroggo
c7bfd5b441 Stop building gm in Android framework build. 
Allows us to delete gm.

Review URL: https://codereview.chromium.org/860803004
 2015-01-20 08:25:36 -08:00
kkinnunen
5037e9de94 Change DebugCanvas API to not encourage memory leaks 
Pass command strings and offset arrays as out parameters instead of
returning new arrays from the functions.

This simplifies debugger leak investigations, as the app leaks less by
design.

Review URL: https://codereview.chromium.org/821663003
 2014-12-30 07:22:58 -08:00
scroggo
09acfc8d1f Pass gyp_source_dir to generate_tool. 
When generating the tool makefiles, which also calls
android_framework_gyp, we also need to pass the gyp directory.

TBR=borenet
NOTRY=True
NOTREECHECKS=True

BUG=skia:3233

Review URL: https://codereview.chromium.org/804473005
 2014-12-12 09:01:56 -08:00
scroggo
2932276444 Add some debugging information to gyp_to_android. 
Temporary, to help diagnose skbug.com/3233

TBR=borenet
NOTRY=True
NOTREECHECKS=True
BUG=skia:3233

Review URL: https://codereview.chromium.org/802703002
 2014-12-12 07:51:37 -08:00
scroggo
60936c732b Add parameter to specify gyp dir to gyp_to_android. 
NOTRY=true
NOTREECHECKS=True
BUG=skia:3233

Review URL: https://codereview.chromium.org/800573002
 2014-12-11 13:05:14 -08:00
scroggo
6cfce1b7b4 Change how SkDebugf is sent to stdout on Android. 
Previously, a function was called using dlsym in skia_launcher.

Add a static initializer that changes the setting, and include that for
the tools we automate for testing.

Also only do va_copy if we actually use it.

BUG=skia:2454

Review URL: https://codereview.chromium.org/753543003
 2014-12-10 10:23:06 -08:00
mtklein
76b3ac9eff Simplfy DEPS: always pull all deps, remove unused barelinux platform. 
Left some notes about where we might further clean up.

BUG=skia:

Review URL: https://codereview.chromium.org/753633002
 2014-11-21 11:41:35 -08:00
djsollen
0b17d6cb34 Cleanup public includes directory. 
This CL updates various files in the includes directory to ensure that (1) they do
not depend on headers in /src and (2) that they minimize their dependence on external
headers.

To ensure that we don't regress this behavior a new build target has been added to
build a single cpp file that contains all* public includes and is compiled with
only those directories in the include path.

* The exception is those includes that depend on OS specific headers

BUG=skia:2941
NOTRY=true

Review URL: https://codereview.chromium.org/721903002
 2014-11-13 12:52:35 -08:00
scroggo
8338a9a855 Reland "Move from libstlport to libc++ for Android framework builds" (patchset #1 id:1 of https://codereview.chromium.org/718793003/) 
> Original issue's description:
> > Move from libstlport to libc++ for Android framework builds
> >
> > Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72
>
> TBR=tomhudson@google.com,djsollen@google.com
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/3c3fe7ce4893204eb8bcf885e8a1d539763bca5d

TBR=tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/717303002
 2014-11-12 11:52:23 -08:00
scroggo
3c3fe7ce48 Revert of Move from libstlport to libc++ for Android framework builds (patchset #1 id:1 of https://codereview.chromium.org/714113002/) 
Reason for revert:
The code this depends on is not ready yet. We can submit once https://android-review.googlesource.com/#/c/113924/ is submitted.

Original issue's description:
> Move from libstlport to libc++ for Android framework builds
>
> Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72

TBR=tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/718793003
 2014-11-11 13:58:44 -08:00
djsollen
ce259510a7 Move from libstlport to libc++ for Android framework builds 
Review URL: https://codereview.chromium.org/714113002
 2014-11-11 07:02:03 -08:00
scroggo
978d37b343 Add LOCAL_PICKUP_FILES to dm and bench makefiles. 
Update the generator to include a line for LOCAL_PICKUP_FILES. When
generating makefiles for our tests, they will now have the following line:

LOCAL_PICKUP_FILES := \
    $(LOCAL_PATH)/../resources

This allows testing infrastructure to pick up resource files used by
our tests.

Update expectations files to test LOCAL_PICKUP_FILES.

BUG=skia:2454

Review URL: https://codereview.chromium.org/704393002
 2014-11-07 06:02:20 -08:00
djsollen
0130c30d0a Add support for clang to the android build scripts 
Review URL: https://codereview.chromium.org/692953002
 2014-10-31 07:00:59 -07:00
djsollen
2550a7ed09 Remove adb from Skia repository 
Review URL: https://codereview.chromium.org/696463003
 2014-10-31 07:00:54 -07:00
djsollen
e228ba3e5c Update the Android NDK to r10c 
Review URL: https://codereview.chromium.org/689943002
 2014-10-30 13:27:26 -07:00
djsollen
f49bba8104 Use the most recent version of ADB from the SDK if necessary. 
This removes ADB from the Skia checkout and also does some quick
checks to make sure the version of ADB used meets a minimum threshold

Review URL: https://codereview.chromium.org/692513003
 2014-10-30 05:57:31 -07:00
djsollen
c96aa64246 Add a helper script to expose which version of adb the android scripts use. 
Review URL: https://codereview.chromium.org/692633002
 2014-10-29 12:59:50 -07:00
Derek Sollenberger
cd048d18e0 Update adb on linux to 1.0.32 
Review URL: https://codereview.chromium.org/684203002
 2014-10-29 11:41:17 -04:00
hcm
89e5caa6fb Revert of Update the Android NDK to r10c (patchset #1 id:1 of https://codereview.chromium.org/687603002/) 
Reason for revert:
Spooky behavior on Nexus GPUs

Original issue's description:
> Update the Android NDK to r10c
>
> Committed: https://skia.googlesource.com/skia/+/a01a17b3f2f225d9499627e20f9b42ce351bd0eb

TBR=tomhudson@chromium.org,borenet@google.com,tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/685753003
 2014-10-28 08:25:31 -07:00
djsollen
a01a17b3f2 Update the Android NDK to r10c 
Review URL: https://codereview.chromium.org/687603002
 2014-10-28 06:53:09 -07:00
mtklein
f5b6bf775c Make -d x86 have the default GPU cache size. 
We have no a priori reason to limit the cache for new devices.

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/556863006
 2014-09-09 12:07:05 -07:00
borenet
77d724c078 Fix adb_pull_if_needed 
BUG=skia:
R=djsollen@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/519743002
 2014-08-29 07:56:14 -07:00
Eric Boren
60d30548e8 Add Android copy_directory_contents_[to|from]_device scripts 
BUG=skia:
NOTRY=true
R=djsollen@google.com

Review URL: https://codereview.chromium.org/510653004
 2014-08-28 09:31:15 -04:00
mtklein
7deeaf9521 add n5 
NOTRY=true

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/506403004
 2014-08-27 08:38:12 -07:00
djsollen
ed20c9b9c9 Fix root level Android.mk to now point to the correct nanobench makefile 
R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/494193003
 2014-08-21 13:12:34 -07:00
djsollen
8ebdd99bb1 Cleanup FDO options. 
R=tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/489373004
 2014-08-21 13:02:27 -07:00
djsollen
6bf35c2100 Update FDO options to match what is needed by the framework 
R=tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/497503003
 2014-08-21 07:38:31 -07:00
mtklein
0459cc732b Android.mk: bench_pictures -> nanobench 
We're only keeping bench_pictures around for the bots now.  For human-initiated work, nanobench is the way to go.

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/484663002
 2014-08-18 08:44:54 -07:00
borenet
dc0fcbb925 Fix Android platform self-tests 
Remove things related to no-longer-existing unittests, run makefile_writer_tests --rebaseline

BUG=skia:2843
R=djsollen@google.com, scroggo@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/481943002
 2014-08-18 08:13:12 -07:00
Derek Sollenberger
c7f069b501 Fix Android framework builds 
R=mtklein@google.com

Review URL: https://codereview.chromium.org/450503002
 2014-08-06 16:31:41 -04:00
mtklein
be21e3432e Bye bye bench. 
NOTREECHECKS=true

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/442343004
 2014-08-06 08:39:38 -07:00
mtklein
d3d6b818c7 Stop building tests in the Android tree. 
BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/440653004
 2014-08-04 09:57:37 -07:00
djsollen
937fca8106 Add ability to generate/use FDO profiles for Android 
R=scroggo@google.com, bungeman@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/420803003
 2014-07-29 12:38:25 -07:00
caryclark
7419e95f39 remove command line args 
R=robertphillips@google.com
TBR=robertphillips
NOTRY=true
NOTREECHECKS=true

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/408243003
 2014-07-22 10:54:08 -07:00
caryclark
fa9d1356d9 fix nacl 
R=robertphillips@google.com
TBR=robertphillips
NOTRY=true
NOTREECHECKS=true

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/407163002
 2014-07-22 10:40:06 -07:00
djsollen
384b0202c0 Fix mac NDK builds 
R=jvanverth@google.com, scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/401613005
 2014-07-17 14:00:57 -07:00
qiankun.miao
ac298384b3 Fix warning about missing shared library symbols in android_gdbserver 
Grab related shared libraryies. Remove libcorkscrew.so due libcorkscrew
is removed from AOSP.

BUG=skia:
R=djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/399843002
 2014-07-17 08:18:23 -07:00
scroggo
3eb258d3f6 Generate makefile for bench_pictures. 
When generating Android framework makefiles, create one for
bench_pictures.

BUG=skia:2744
R=djsollen@google.com, halcanary@google.com, mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/391423002
 2014-07-17 06:58:29 -07:00
qiankun.miao
d75547925d Make gdb work for 64-bit Skia 
BUG=skia:
R=djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/398733002
 2014-07-16 13:21:15 -07:00
scroggo
24b04fa2ad Alphabetize defines in generated SkUserConfig. 
When generating SkUserConfig.h for Android, alphabetize the defines.

This will make one merge much harder to look at, but every following
one much easier.

R=mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/388693003
 2014-07-14 10:22:02 -07:00
djsollen
f94bdb84ef explicitly add /data/local/tmp to the library path to support new AOSP restrictions 
BUG=skia:2660
R=tomhudson@chromium.org, tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/387893003
 2014-07-11 08:47:23 -07:00
Derek Sollenberger
777a7dd519 Add config to build mips with dsp2 optimizations enabled by default. 
R=borenet@google.com

Review URL: https://codereview.chromium.org/380213004
 2014-07-10 13:04:24 -04:00
Derek Sollenberger
c7d29c86b2 update our build system to support the experimental L-Release NDK 
This includes adding 64-bit support for arm, x86, and mips.

R=borenet@google.com

Review URL: https://codereview.chromium.org/377993002
 2014-07-10 08:10:20 -04:00
tomhudson
f9552230dc Add missing / in android_gdbserver 
Introduced in https://codereview.chromium.org/22617002, apparently
worked just fine, at least on already-set-up devices. Failing at
least since https://codereview.chromium.org/352303003/.

BUG=skia:2729
R=djsollen@google.com, tomhudson@google.com

Author: tomhudson@chromium.org

Review URL: https://codereview.chromium.org/372273003
 2014-07-08 12:29:54 -07:00
scroggo
f50a79366f Use BUILD_NATIVE_TEST instead of BUILD_EXECUTABLE. 
This will generate makefiles for our tools (bench, tests, gm, dm) using
the line "include $(BUILD_NATIVE_TEST)". This has been recommended by the
Android team, as it builds both 32 bit and 64 bit versions of the test.

Do not use LOCAL_MODULE_PATH, which is deprecated (see https://docs.google.com/a/google.com/document/d/1uLAuY7_KYGx1TSzJ9SXkyevT8qNpra2ZoIBkmCoq8VM/edit# ).

Corresponds to ag/498302 , which makes this change just for bench.

R=djsollen@google.com, halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/369673002
 2014-07-08 11:20:58 -07:00
Derek Sollenberger
6815011292 make skia_launcher be a position independent executable 
R=tomhudson@google.com

Review URL: https://codereview.chromium.org/374833003
 2014-07-08 08:26:21 -04:00
scroggo
950f89dd20 Specify the name of tool for creating a makefile. 
When generating tool Android.mks from gyp files, specify the name
of the target needed.

This fixes a bug where nanobench was being added to the same
makefile as bench, which would not compile.

TODO: Make gyp_to_android more general, so that it handles this
case better. See http://skbug.com/2709

R=mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/366653002
 2014-07-01 08:02:30 -07:00
qiankun.miao
b2e1fa5b76 Push resources to Android device 
The resources directory is required by some benchmarks. Push it to
device's /data/local/tmp. Add "-i /data/local/tmp/resources" to command
line when using these resources.

BUG=skia:
R=djsollen@google.com, mtklein@google.com, borenet@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/352303003
 2014-06-29 22:38:54 -07:00
mtklein
9ac68ee259 Move BenchTimer to tools as Timer 
This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Debug-iOS-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
 2014-06-20 11:29:21 -07:00
mtklein
9e64b78ff6 Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/) 
Reason for revert:
GpuTimer broken

Original issue's description:
> Move BenchTimer to tools as Timer
>
> This breaks a bunch of circular dependencies between tools and gm and bench.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/346753003
 2014-06-20 10:43:07 -07:00
mtklein
4ed75287ae Move BenchTimer to tools as Timer 
This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
 2014-06-20 10:31:49 -07:00
reed
876633087e teach Nacl to not call setConfig 
TBR=
NOTRY=True

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/327643003
 2014-06-09 20:40:05 -07:00
qiankun.miao
5102345029 Fix android_run_skia script running with command line options 
This script cannot recognize command line options when running bench:
e.g. android_run_skia bench --config 8888.

BUG=skia:
R=mtklein@google.com, djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/314903003
 2014-06-06 06:43:46 -07:00
scroggo
9de2fb680f Add mips64 to the makefile. 
Currently we have no optimizations for mips64, so it correctly
contains the various _none.cpps.

Corresponds to https://android-review.googlesource.com/#/c/96536/1

R=halcanary@google.com, djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/311163003
 2014-06-05 10:28:36 -07:00
scroggo
0ba5a4a306 Use tests tag for Skia tools on Android. 
When generating the makefiles for Skia testing tools on Android,
use the tag 'tests' and do not use the tags 'optional' or 'eng'.

R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/315013003
 2014-06-04 08:25:50 -07:00
mtklein
bec3634a4a Android: remove -lcutils dependency 
I believe we no longer depend on this after we ported our atomics to __sync.

Tested by running android_ninja.

BUG=skia:
R=scroggo@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/318493002
 2014-06-03 15:38:18 -07:00
scroggo
12ba2cbb9b Update expectations to fix self tests. 
R=epoger@google.com
TBR=epoger@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/306313004
 2014-06-02 13:34:08 -07:00