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

64 Commits

Author SHA1 Message Date
liyuqian
97a0918715 Try fix the mac build bot after removing Android SampleApp 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2117793002

Review-Url: https://codereview.chromium.org/2117793002
 2016-07-06 07:52:08 -07:00
rmistry
7bde5659d3 Revert of Remove Android SampleApp (patchset #5 id:80001 of https://codereview.chromium.org/2096683002/ ) 
Reason for revert:
Testing to see if this CL caused the failures in Build-Mac-Clang-Arm7-Debug-Android

Original issue's description:
> Remove Android SampleApp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2096683002
>
> Committed: https://skia.googlesource.com/skia/+/41bb5b40e71411ee39538399ea125986ec760a90

TBR=djsollen@google.com,liyuqian@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review-Url: https://codereview.chromium.org/2099693002
 2016-06-24 05:24:16 -07:00
liyuqian
41bb5b40e7 Remove Android SampleApp 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2096683002

Review-Url: https://codereview.chromium.org/2096683002
 2016-06-23 12:08:06 -07:00
djsollen
4145792736 Remove VisualBench and its Android implementation. 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018603003

Review-Url: https://codereview.chromium.org/2018603003
 2016-05-27 05:39:29 -07:00
jvanverth
3452426715 Rename VulkanViewer to Viewer, take 2. 
Also puts Window and Application in sk_app namespace.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003

Review-Url: https://codereview.chromium.org/1945103003
 2016-05-04 13:49:13 -07:00
djsollen
f62b2354b3 Upgrade Android Gradle plugins 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926743002

Review-Url: https://codereview.chromium.org/1926743002
 2016-04-27 08:48:56 -07:00
djsollen
12d62a7d51 VulkanViewer on Android 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003

Review URL: https://codereview.chromium.org/1903253003
 2016-04-21 07:59:44 -07:00
djsollen
9df5d07209 Cleanup android build files and tools 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1898793004

Review URL: https://codereview.chromium.org/1898793004
 2016-04-18 12:57:35 -07:00
djsollen
f9deeb66d0 Update android_make to support both --gcc and --clang options. 
This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774503004

Review URL: https://codereview.chromium.org/1774503004
 2016-03-07 12:30:47 -08:00
mtklein
4e79f33452 msan: build expat from source 
This should let us test it on the MSAN bot.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674053002

CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN-Trybot

Review URL: https://codereview.chromium.org/1674053002
 2016-02-07 13:31:23 -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
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
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
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
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
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
joshualitt
030dc847dc Visual bench on native android 
BUG=skia:

Review URL: https://codereview.chromium.org/1164403002
 2015-06-12 12:51:44 -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
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
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
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
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
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
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
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
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
skia.committer@gmail.com
d1061e254a Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14215 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-16 03:04:01 +00:00
commit-bot@chromium.org
ec1ff6aa5e Fix generation of Android SampleApp APK now that we default to using gyp's ninja generator. 
R=scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/235783003

git-svn-id: http://skia.googlecode.com/svn/trunk@14212 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-15 21:37:12 +00:00
rmistry@google.com
d6bab02386 Reverting r12427 
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-02 13:50:38 +00:00
skia.committer@gmail.com
5b39f5ba9c Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-02 13:36:22 +00:00
commit-bot@chromium.org
3daa1aed7a Support linking skia statically on Android 
Support linking skia statically on Android. Skia symbols should be
exported by the app library, to the extent that skia_launcher needs
them.

Syncs libskia_android.so to the device only if it exists.

R=djsollen@google.com

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/61893008

git-svn-id: http://skia.googlecode.com/svn/trunk@12399 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-26 20:39:11 +00:00
mtklein@google.com
f1077f9164 Add extra warnings to match what Android uses. 
R=mtklein@google.com

Committed: https://code.google.com/p/skia/source/detail?r=12310

Review URL: https://codereview.chromium.org/74193005

git-svn-id: http://skia.googlecode.com/svn/trunk@12314 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-20 15:13:49 +00:00
scroggo@google.com
b60cdc8f4c Revert "Add extra warnings to match what Android uses." 
This reverts commit d234662df1ffeb1bf45b2ade16c4acfb94f89450.

This change broke the build. Will resubmit after fixing warnings.

git-svn-id: http://skia.googlecode.com/svn/trunk@12311 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-20 13:58:58 +00:00