Commit Graph

213 Commits

Author SHA1 Message Date
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