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
scroggo
b30aa62294
Update comments about debugging on master.
...
Update the makefile to reference the correct location of
config.mk.
R=djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/308703009
2014-06-02 07:19:13 -07:00
commit-bot@chromium.org
738a9218b8
If our gyp does not exist, use chromium's.
...
The previous version had faith that if the third_party folder
existed, it must contain externals/gyp. A recent change added
third_party (in git, as opposed to using DEPS), so now Android
has third_party but not externals/gyp.
Now check the full filepath. If it's not there, back up to
chromium's version.
Fixes Android canary bot.
R=halcanary@google.com
TBR=halcanary@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/295103008
git-svn-id: http://skia.googlecode.com/svn/trunk@14855 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-22 19:30:54 +00:00
commit-bot@chromium.org
114487ceb4
Fix generation tests.
...
R=epoger@google.com
TBR=epoger
NOTRY=true
BUG=skia:2565
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/284313007
git-svn-id: http://skia.googlecode.com/svn/trunk@14771 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 19:48:57 +00:00
commit-bot@chromium.org
120c99993e
Generate Android.mk for DM.
...
ifdef out code that won't build where we don't have jsoncpp.
Include ctype instead of string.h for tolower.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
R=mtklein@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/290603002
git-svn-id: http://skia.googlecode.com/svn/trunk@14768 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 18:11:51 +00:00
commit-bot@chromium.org
25c1066e4d
Generate gm/Android.mk, minus JSON.
...
When running gyp_to_android.py, generate the makefile for gm.
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
gm/gm_expectations.cpp:
gm/gm_expectations.h:
gm/gmmain.cpp:
Remove all json functionality when SK_BUILD_JSON_WRITER is not defined.
This flag is not defined when SK_BUILD_FOR_ANDROID is defined.
gyp/gm.gyp:
Depend on skia and cutils.
platform_tools/android/bin/gyp_to_android.py:
Generate gm/Android.mk.
platform_tools/android/gyp_gen/makefile_writer.py:
Build gm/Android.mk when building external/skia.
Depends on https://codereview.chromium.org/282053002/
BUG=skia:2447
BUG=skia:2448
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/281303003
git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 17:56:43 +00:00
commit-bot@chromium.org
61744ec1d2
Generate bench/Android.mk from gyp.
...
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.
bench/DeferredSurfaceCopyBench.cpp:
Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly.
bench/ResultsWriter.h:
bench/benchmain.cpp:
Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined,
which is the case for the Android framework build.
gyp/bench.gyp:
Depend on skia and cutils (for android_atomic_inc etc).
gyp/common_conditions.gypi:
Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set.
gyp/common_variables.gypi:
Add a flag for skia_build_json_writer, and set it only when
skia_android_framework is not set.
gyp/jsoncpp.gyp:
Do not build jsoncpp when skia_build_json_writer is not defined.
include/utils/SkJSONCPP.h:
Do not include json headers when SK_BUILD_JSON_WRITER is not defined.
platform_tools/android/bin/gyp_to_android.py:
Generate bench/Android.mk.
platform_tools/android/gyp_gen/gypd_parser.py:
Skip dest_dir when checking for include_dirs.
platform_tools/android/gyp_gen/makefile_writer.py:
Build bench/Android.mk when building external/skia.
platform_tools/android/gyp_gen/tool_makefile_writer.py:
Add a parameter for putting the binary into /data/local/tmp.
BUG=skia:2447
BUG=skia:2448
R=halcanary@google.com , reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/282053002
git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-16 13:15:41 +00:00
commit-bot@chromium.org
8041f3dace
arm64make script - fix error preventing Release testing.
...
R=scroggo@google.com , djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/258323002
git-svn-id: http://skia.googlecode.com/svn/trunk@14730 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-14 15:36:54 +00:00
commit-bot@chromium.org
105775b823
Run Android make script from any directory
...
R=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/260743003
git-svn-id: http://skia.googlecode.com/svn/trunk@14594 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-06 18:31:09 +00:00
commit-bot@chromium.org
c1dc0d486f
Fix android_install_apk script to work with changes from a137675
...
(http://crrev.com/223613004 ). See http://crrev.com/256413006 or
http://crrev.com/262053007 for similar changes.
R=djsollen@google.com , mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/266373005
git-svn-id: http://skia.googlecode.com/svn/trunk@14593 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-06 18:29:28 +00:00
commit-bot@chromium.org
e8846f3d3f
Fix android_perf script to work with changes from a137675
...
(http://crrev.com/223613004 ). See http://crrev.com/256413006
for a similar change.
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/262053007
git-svn-id: http://skia.googlecode.com/svn/trunk@14574 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-05 18:40:15 +00:00
djsollen@google.com
cce39b264c
Remove extra includes from android sample app
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/264773012
git-svn-id: http://skia.googlecode.com/svn/trunk@14540 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-02 17:41:33 +00:00
commit-bot@chromium.org
123f3d74e3
Add more detailed logging when things go wrong in android_run_skia
...
R=borenet@google.com , halcanary@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/263733006
git-svn-id: http://skia.googlecode.com/svn/trunk@14513 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 19:30:35 +00:00
commit-bot@chromium.org
c2d6a20ef8
Improve Android gdbserver and gdb_ex scripts
...
- Don't complain if $GDB_TMP_DIR already exists
- Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file.
NOTRY=true
R=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/266453006
git-svn-id: http://skia.googlecode.com/svn/trunk@14503 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 15:34:28 +00:00
commit-bot@chromium.org
e3916bfe0e
Support unknown Android target devices via environment variables.
...
This is useful for working with prototypes and uncommon devices.
NOTRY=true
R=djsollen@google.com , scroggo@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/263673004
git-svn-id: http://skia.googlecode.com/svn/trunk@14495 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-01 12:56:19 +00:00
commit-bot@chromium.org
b0ba9f8b1d
make gitignore happy with symlinks
...
See https://codereview.chromium.org/139473002 for similar CL.
R=djsollen@google.com , mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/267543002
git-svn-id: http://skia.googlecode.com/svn/trunk@14484 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-30 19:55:51 +00:00
commit-bot@chromium.org
edea842b6a
Revert of Improve Android scripts: ( https://codereview.chromium.org/254923003/ )
...
Reason for revert:
errors
Original issue's description:
> Improve Android scripts:
>
> * android_gdbserver:
> - Don't complain if $GDB_TMP_DIR already exists
> - Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file.
>
> * android_run_skia:
> - Move resource files onto the device.
> - Change to tmp directory before executing program.
>
> * android_make, android_setup:
> - stop assuming PWD is skia source directory.
>
> NOTRY=true
>
> Committed: http://code.google.com/p/skia/source/detail?r=14442
R=djsollen@google.com , scroggo@google.com
TBR=djsollen@google.com , scroggo@google.com
NOTREECHECKS=true
NOTRY=true
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/254073003
git-svn-id: http://skia.googlecode.com/svn/trunk@14448 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29 21:00:06 +00:00
commit-bot@chromium.org
7f07e956fe
adb_push_if_needed - make target directory if it does not exist.
...
(fixes error introduced in 21a6d13.)
NOTRY=true
R=djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/255263002
git-svn-id: http://skia.googlecode.com/svn/trunk@14445 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29 20:12:21 +00:00
commit-bot@chromium.org
21a6d13a2b
Improve Android scripts:
...
* android_gdbserver:
- Don't complain if $GDB_TMP_DIR already exists
- Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file.
* android_run_skia:
- Move resource files onto the device.
- Change to tmp directory before executing program.
* android_make, android_setup:
- stop assuming PWD is skia source directory.
NOTRY=true
R=djsollen@google.com , scroggo@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/254923003
git-svn-id: http://skia.googlecode.com/svn/trunk@14442 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29 19:09:58 +00:00
commit-bot@chromium.org
19a21894ea
android_gdbserver - fix warning about missing shared library symbols
...
The warning was:
warning: Could not load shared library symbols for 4 libraries,
e.g. /system/bin/linker. Use the "info sharedlibrary" command to
see the complete listing.
Fixed by grabbing all of those libraries along with libc.so.
NOTRY=true
R=scroggo@google.com , djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/255193003
git-svn-id: http://skia.googlecode.com/svn/trunk@14441 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29 19:04:21 +00:00
commit-bot@chromium.org
a3987574c8
Explicitly include gyp_gen/android_framework_gyp.
...
Add __init__.py to gyp_gen and explicitly include android_framework_gyp
from there.
Fixes a bug where after moving that file, python was looking for it in
its old location, where there was a compiled version of the file.
BUG=skia:2468
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/251903003
git-svn-id: http://skia.googlecode.com/svn/trunk@14427 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-29 00:39:45 +00:00
commit-bot@chromium.org
d665685469
Generate tests/Android.mk from gyp
...
gyp/apptype_console.gypi:
Don't include console app dependencies when building for Android framework.
gyp/tests.gyp:
Add/remove libraries for framework build.
platform_tools/android/bin/android_framework_gyp.py:
Moved to gyp_gen.
clean_up_gypd_files moved to this script.
platform_tools/android/bin/gyp_to_android.py:
Call new function for generating tool makefile.
Set LOCAL_MODULE.
platform_tools/android/gyp_gen/gypd_parser.py:
Support relative paths.
platform_tools/android/gyp_gen/makefile_writer.py:
Factor out helper functions to be used by tool writer.
LOCAL_MODULE is set elsewhere.
platform_tools/android/gyp_gen/tool_makefile_writer.py:
Multipurpose file for writing makefiles for tools. Should be able to use
it mostly unchanged for bench, gm, etc.
platform_tools/android/gyp_gen/vars_dict_lib.py:
Make the comments follow the style guide.
Add set().
Rename __li to __ordered_set
More/update tests:
platform_tools/android/tests/android_framework_gyp_tests.py
platform_tools/android/tests/expectations/Android.mk
platform_tools/android/tests/expectations/tool/Android.mk
platform_tools/android/tests/expectations/write_local_vars_append_arm
platform_tools/android/tests/expectations/write_local_vars_append_foo
platform_tools/android/tests/expectations/write_local_vars_append_no_name
platform_tools/android/tests/expectations/write_local_vars_no_append_arm
platform_tools/android/tests/expectations/write_local_vars_no_append_foo
platform_tools/android/tests/expectations/write_local_vars_no_append_no_name
platform_tools/android/tests/gyp_to_android_tests.py
platform_tools/android/tests/makefile_writer_tests.py
platform_tools/android/tests/ordered_set_tests.py
platform_tools/android/tests/test_variables.py
BUG=skia:2447
May require an update to the bot to remove pyc files.
R=halcanary@google.com , djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/235883015
git-svn-id: http://skia.googlecode.com/svn/trunk@14408 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-28 16:00:30 +00:00
commit-bot@chromium.org
44566e2a15
Fix android_gdbserver script to work with changes from a137675
.
...
Also stop assuming ANDROID_ARCH one of x86 or arm.
NOTRY=true
R=mtklein@google.com , djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/256413006
git-svn-id: http://skia.googlecode.com/svn/trunk@14358 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24 18:36:36 +00:00
commit-bot@chromium.org
e20f7cf995
android scripts respect SKIA_OUT, if already set.
...
R=scroggo@google.com , djsollen@google.com , mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/250303002
git-svn-id: http://skia.googlecode.com/svn/trunk@14350 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-24 15:16:32 +00:00
commit-bot@chromium.org
ec68ee9d56
Allow running gyp_to_android without SkUserConfig.
...
The old code requires that include/config/SkUserConfig.h exists,
to ensure that it gets copied into Android's
include/core/SkUserConfig.h when we do a merge. However, if a
developer wants to make changes and rerun the script, they
should not have to recreate include/config/SkUserConfig.h just
to rerun the script. By default, allow the original to not
exist and just skip the copy.
Update tests to pass. Also add tests to support this use case.
Make gyp_to_android.py executable.
R=robertphillips@google.com , halcanary@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/242203008
git-svn-id: http://skia.googlecode.com/svn/trunk@14273 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-21 14:45:01 +00:00
commit-bot@chromium.org
d202528f48
SkiaSampleRenderer - handle case where compiler won't cast jint to void*.
...
R=djsollen@google.com , scroggo@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/239703016
git-svn-id: http://skia.googlecode.com/svn/trunk@14244 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-17 19:41:06 +00: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
commit-bot@chromium.org
86cbfbeee6
arm64_download script - fix error starting vm twice.
...
R=epoger@google.com
TBR=epoger@google.com
NOTRY=true
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/239653003
git-svn-id: http://skia.googlecode.com/svn/trunk@14210 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 20:29:38 +00:00
commit-bot@chromium.org
87126fb154
arm64_download script waits for VM to boot before finishing.
...
It may take an unknown amount of time to boot.
Also, add `set -e` to the script to simplify error handling.
BUG=skia:2425
NOTRY=true
R=epoger@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/239243005
git-svn-id: http://skia.googlecode.com/svn/trunk@14209 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-15 20:05:24 +00:00
commit-bot@chromium.org
fe23f7978f
Revert of remove sprintf ( https://codereview.chromium.org/230413005/ )
...
Reason for revert:
Boo, hiss, SK_ARRAY_COUNT not defined in skia_launcher.cpp!
Original issue's description:
> remove sprintf
>
> Committed: http://code.google.com/p/skia/source/detail?r=14123
R=halcanary@google.com
TBR=halcanary@google.com
NOTREECHECKS=true
NOTRY=true
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/232323002
git-svn-id: http://skia.googlecode.com/svn/trunk@14125 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 23:38:57 +00:00
commit-bot@chromium.org
d6e9b88468
remove sprintf
...
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/230413005
git-svn-id: http://skia.googlecode.com/svn/trunk@14123 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 23:22:44 +00:00
commit-bot@chromium.org
0257ebe4ac
enable developers to provide their own android toolchain
...
R=halcanary@google.com , scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/227673003
git-svn-id: http://skia.googlecode.com/svn/trunk@14113 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 18:57:42 +00:00
commit-bot@chromium.org
479d1ae9b6
Fixes to Android.mk generation for arm64.
...
Remove warning about no optimizations for arm64 and rebaseline the
associated test.
Exclude _opts_none.cpps when building arm64, to avoid double definitions.
BUG=skia:1975
R=halcanary@google.com , djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/229393002
git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 13:34:26 +00:00
commit-bot@chromium.org
a13767579d
hack hack hack
...
Edit down the android scripts a bit.
- set -e
- detect ccache by default
- -t for BUILDTYPE
I figure the -t changes are going to break some bots.
BUG=skia:
R=djsollen@google.com , mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/223613004
git-svn-id: http://skia.googlecode.com/svn/trunk@14061 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-04 16:26:42 +00:00
commit-bot@chromium.org
c13fae6d49
android_make now exactly the same as android_ninja
...
BUG=skia:2382
NOTREECHECKS=True
NOTRY=True
R=djsollen@google.com , mtklein@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/223943002
git-svn-id: http://skia.googlecode.com/svn/trunk@14045 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-03 15:08:49 +00:00
commit-bot@chromium.org
6ce77fa778
Fix ninja build for Android
...
android_ninja build script can't recognize "BUILDTYPE=Release". This
CL parses and sets the BUILDTYPE parameter in android_setup.sh.
BUG=skia:2383
R=epoger@google.com , scroggo@google.com , mtklein@google.com , djsollen@google.com
Author: qiankun.miao@intel.com
Review URL: https://codereview.chromium.org/221283007
git-svn-id: http://skia.googlecode.com/svn/trunk@14043 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-03 14:48:17 +00:00
commit-bot@chromium.org
a749e60e74
arm64_make script changes
...
TODO: Call this script from the bots with command sh -x arm64_make
Motivation: This will give the logs more complete information about
what the scripts are doing.
NOTRY=true
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/222803002
git-svn-id: http://skia.googlecode.com/svn/trunk@14032 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-02 20:12:25 +00:00
commit-bot@chromium.org
6f2d4d4679
ARM Skia NEON patches - 35 - First AArch64 support
...
Aarch64 support
This change contains the necessary modifications to have Skia build and
run properly on an ARMv8 processor in aarch64 execution state.
Here's a list of the changes:
- add an arm64 target to the build system + SK_CPU_ARM64 flag
- MatrixTest was failing when built in Release mode. Fused MAC
instructions were generated which made some intermediate results
more accurate. As the test relies on result comparison, the more
precise results when compared to others led to a gap bigger than
what was tolerated. As I don't know if some actual skia code relies
on results being comparable, I've disabled fused MAC instruction
with -ffp-contract=off for arm64.
- Modify include/core/SkOnce.h to have barriers work.
- SK_CPU_ARM64 implies SK_ARM_NEON_MODE_ALWAYS.
- use existing Xfermode optimisations with modifications that can be
removed in the future when toolchains are ready. Also save a few
instructions is two Xfermodes (will apply to ARM too).
- use existing SkBoxBlur and SkMorphology optimisations.
- use existing SkBlitMask optimisations
- use existing BitmapProcState and Convolution optimisations.
Future changes will include:
- Blitters (only partialy merged upstream)
- SkUtils (there's little value in sending asm optimisations without
having them benchmarked on real hardware).
Signed-off-by: Kevin PETIT <kevin.petit@arm.com>
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=13980
R=djsollen@google.com , reed@google.com , mtklein@google.com , halcanary@google.com
Author: kevin.petit@arm.com
Review URL: https://codereview.chromium.org/143423004
git-svn-id: http://skia.googlecode.com/svn/trunk@14025 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-02 15:03:56 +00:00
commit-bot@chromium.org
23f116daa3
Rename test SkUserConfig files.
...
Since we never want to build with the fake SkUserConfig.h files
(they're only there for testing), change their name to
SkUserConfig-h.txt. Now the housekeeper will ignore it.
Also, update the generated version to match what the housekeeper
wanted. It wants my tabs to be 4 spaces, so change my tabs to 4
spaces!
NOTRY=true
Fixes buildbots.
BUG=skia:2365
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/221063003
git-svn-id: http://skia.googlecode.com/svn/trunk@14013 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 19:03:00 +00:00
epoger@google.com
58d69d8460
change default build (in "make" wrapper) to ninja on all platforms
...
force-landed from https://codereview.chromium.org/206463007/ ;
the CommitQueue couldn't handle the diff properly for some reason
git-svn-id: http://skia.googlecode.com/svn/trunk@14003 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-01 07:02:41 +00:00
skia.committer@gmail.com
da0d978b1f
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13989 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-29 03:02:36 +00:00
commit-bot@chromium.org
5be2def19a
Fix the ninja build on mac to use nm/readelf from the Android toolchain instead of the host system.
...
BUG=skia:2338
R=mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/216793007
git-svn-id: http://skia.googlecode.com/svn/trunk@13985 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-28 18:08:59 +00:00
commit-bot@chromium.org
d643a90ee2
Revert of ARM Skia NEON patches - 35 - First AArch64 support ( https://codereview.chromium.org/143423004/ )
...
Reason for revert:
GYP's failing on most (all?) bots.
Original issue's description:
> ARM Skia NEON patches - 35 - First AArch64 support
>
> Aarch64 support
>
> This change contains the necessary modifications to have Skia build and
> run properly on an ARMv8 processor in aarch64 execution state.
>
> Here's a list of the changes:
>
> - add an arm64 target to the build system + SK_CPU_ARM64 flag
>
> - MatrixTest was failing when built in Release mode. Fused MAC
> instructions were generated which made some intermediate results
> more accurate. As the test relies on result comparison, the more
> precise results when compared to others led to a gap bigger than
> what was tolerated. As I don't know if some actual skia code relies
> on results being comparable, I've disabled fused MAC instruction
> with -ffp-contract=off for arm64.
>
> - Modify include/core/SkOnce.h to have barriers work.
>
> - SK_CPU_ARM64 implies SK_ARM_NEON_MODE_ALWAYS.
>
> - use existing Xfermode optimisations with modifications that can be
> removed in the future when toolchains are ready. Also save a few
> instructions is two Xfermodes (will apply to ARM too).
>
> - use existing SkBoxBlur and SkMorphology optimisations.
>
> - use existing SkBlitMask optimisations
>
> - use existing BitmapProcState and Convolution optimisations.
>
> Future changes will include:
>
> - Blitters (only partialy merged upstream)
>
> - SkUtils (there's little value in sending asm optimisations without
> having them benchmarked on real hardware).
>
> Signed-off-by: Kevin PETIT <kevin.petit@arm.com>
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=13980
R=djsollen@google.com , reed@google.com , halcanary@google.com , kevin.petit@arm.com
TBR=djsollen@google.com , halcanary@google.com , kevin.petit@arm.com , reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/216113005
git-svn-id: http://skia.googlecode.com/svn/trunk@13983 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-28 18:05:29 +00:00
commit-bot@chromium.org
7a0e27577d
ARM Skia NEON patches - 35 - First AArch64 support
...
Aarch64 support
This change contains the necessary modifications to have Skia build and
run properly on an ARMv8 processor in aarch64 execution state.
Here's a list of the changes:
- add an arm64 target to the build system + SK_CPU_ARM64 flag
- MatrixTest was failing when built in Release mode. Fused MAC
instructions were generated which made some intermediate results
more accurate. As the test relies on result comparison, the more
precise results when compared to others led to a gap bigger than
what was tolerated. As I don't know if some actual skia code relies
on results being comparable, I've disabled fused MAC instruction
with -ffp-contract=off for arm64.
- Modify include/core/SkOnce.h to have barriers work.
- SK_CPU_ARM64 implies SK_ARM_NEON_MODE_ALWAYS.
- use existing Xfermode optimisations with modifications that can be
removed in the future when toolchains are ready. Also save a few
instructions is two Xfermodes (will apply to ARM too).
- use existing SkBoxBlur and SkMorphology optimisations.
- use existing SkBlitMask optimisations
- use existing BitmapProcState and Convolution optimisations.
Future changes will include:
- Blitters (only partialy merged upstream)
- SkUtils (there's little value in sending asm optimisations without
having them benchmarked on real hardware).
Signed-off-by: Kevin PETIT <kevin.petit@arm.com>
BUG=skia:
R=djsollen@google.com , reed@google.com , mtklein@google.com , halcanary@google.com
Author: kevin.petit@arm.com
Review URL: https://codereview.chromium.org/143423004
git-svn-id: http://skia.googlecode.com/svn/trunk@13980 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-28 17:56:14 +00:00
commit-bot@chromium.org
ba0c5ea90d
Updates to Android.mk generation.
...
Generate SkUserConfig.
Include arm64 as another build flavor.
Add tests.
gyp/common_conditions.gypi:
Add conditions for Android framework. These will get written into the generated SkUserConfig.
include/core/SkUserConfig.h:
Generated version that will ultimately be checked into Android (but not here).
platform_tools/android/bin/gyp_to_android.py:
Generate SkUserConfig.
Add arm64 (note that arm64 is not currently respected by our gyp files, so it results in use _none.cpp for the various opts).
Reset the common defines, which are now passed to the generated SkUserConfig.
platform_tools/android/gyp_gen/generate_user_config.py:
New script to generate SkUserConfig.h.
platform_tools/android/gyp_gen/gypd_parser.py:
Fix a lint error (unused import).
platform_tools/android/gyp_gen/makefile_writer.py:
Append any remaining DEFINES to LOCAL_CFLAGS (previously this was done during parsing).
Add a warning for arm64 (corresponds to downstream Android.mk).
platform_tools/android/gyp_gen/vars_dict_lib.py:
Add OrderedSet.reset().
Add DEFINES to VarsDict.
platform_tools/android/tests/expectations/:
Add and update expectations files.
platform_tools/android/tests/generate_user_config_tests.py:
New test for generate_user_config.py
platform_tools/android/tests/inputs/SkUserConfig.h:
Input to the new test, so we don't have to update the expectations each time the real SkUserConfig.h changes.
platform_tools/android/tests/makefile_writer_tests.py:
Add a way to rebaseline test_write_local_vars, which has changed.
Refactor EXPECTATIONS_DIR and compare_files into a separate file for sharing with generate_user_config_tests.py.
platform_tools/android/tests/utils.py:
Common code for tests.
platform_tools/android/tests/var_dict_tests.py:
Use a for loop to test the new key (DEFINES) and future proof this test to test any new keys in the future.
BUG=skia:1975
R=djsollen@google.com , halcanary@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/198063002
git-svn-id: http://skia.googlecode.com/svn/trunk@13975 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-28 15:59:04 +00:00
commit-bot@chromium.org
f6394d91e5
Add tests for makefile_writer.py.
...
Many of the tests performed are comparison tests, where we call the
functions using dummy values and then compare to expectations (also
newly added).
Add a way to rebaseline the test for write_android_mk, which is likely
to change in the future.
BUG=skia:1975
R=epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/205383006
git-svn-id: http://skia.googlecode.com/svn/trunk@13957 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-26 19:46:51 +00:00
commit-bot@chromium.org
b0a6578c7f
platform_tools/barelinux/bin/arm64_make script
...
Motivation: an upcoming CL will change the Gyp variables.
That CL can change this script and the deps roll bot will
pick up those changes.
NOTRY=true
R=borenet@google.com , djsollen@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/211133002
git-svn-id: http://skia.googlecode.com/svn/trunk@13937 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-25 15:37:36 +00:00
commit-bot@chromium.org
2ac68c6892
Add tools to generated Android.mk
...
Include the skia tools (bench, gm, tests) in the generated Android
make file for the framework. They are commented out, so that a tester
can include them if desired.
BUG=skia:1975
R=halcanary@google.com , djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/210173002
git-svn-id: http://skia.googlecode.com/svn/trunk@13915 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-24 18:26:36 +00:00
commit-bot@chromium.org
e65f1fa7bc
fix error in linux makefile for some shells
...
R=borenet@google.com
TBR=borenet@google.com
NOTRY=true
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/196823007
git-svn-id: http://skia.googlecode.com/svn/trunk@13882 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-20 19:56:55 +00:00
commit-bot@chromium.org
662af29307
android_run_skia: fix error check
...
(SkipBuildbotRuns)
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/204713003
git-svn-id: http://skia.googlecode.com/svn/trunk@13881 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-20 19:48:16 +00:00
commit-bot@chromium.org
e32eeec7bf
add some debugging for bug skia:2313
...
(SkipBuildbotRuns)
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com
Author: epoger@google.com
Review URL: https://codereview.chromium.org/198203004
git-svn-id: http://skia.googlecode.com/svn/trunk@13877 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-20 17:32:27 +00:00
commit-bot@chromium.org
0015df93b3
Make arm64 test script more efficient with old versions of gsutil.
...
This continues the changes indtroduced in
<https://codereview.chromium.org/183883020 >, and also simplifies the
script considerably.
R=borenet@google.com
TBR=borenet@google.com
NOTRY=true
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/176973010
git-svn-id: http://skia.googlecode.com/svn/trunk@13686 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-06 17:47:49 +00:00
commit-bot@chromium.org
c4b3e75a7b
Make arm64 test script comaptable with old versions of gsutil.
...
NOTRY=true
R=borenet@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/183883020
git-svn-id: http://skia.googlecode.com/svn/trunk@13668 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-05 14:16:36 +00:00
commit-bot@chromium.org
6e2be5dbe3
Fix error in barelinux_make build script
...
R=borenet@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/187093002
git-svn-id: http://skia.googlecode.com/svn/trunk@13661 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-03-04 22:32:49 +00:00
commit-bot@chromium.org
069c2a46ba
Updates to the Android.mk writer.
...
Keeping up with changes made to the Android.mk file that is
currently checked in.
R=djsollen@google.com , epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/183953002
git-svn-id: http://skia.googlecode.com/svn/trunk@13626 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-28 17:24:32 +00:00
commit-bot@chromium.org
64ca10287a
Use chromium's gyp if third_party is not available.
...
This is for building Android.mk inside an Android tree where there
is no third_party directory.
R=djsollen@google.com , epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/177073022
git-svn-id: http://skia.googlecode.com/svn/trunk@13614 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-27 18:58:51 +00:00
commit-bot@chromium.org
f84722e477
Build Skia for a bare-bones embedded Linux system.
...
Motivation:
I have downloaded a barebones Linux system built for 64-bit ARM
from linaro.org and a ARMv8 Foundation Model from arm.com to run
it on. This will let us build and test Skia on ARM64 before we
aquire hardware to allow that. This CL introduces the changes to
the build files necessary to build Skia on a barebones embedded
Linux system. I tested it with the aarch64 GCC compiler provided
by linaro.org.
Changes:
Add a "barelinux" target_os for the DEPS file. Add an optional
git download of zlib.
Changes to gyp files: these changes abstract out libpng, libz, and
giflib so that images.gyp doesn't know whether they are static or
dynamically linked. I also add the variables skia_giflib_static,
skia_libpng_static, skia_zlib_static, and skia_freetype_static,
all of which default to false but when set to true will override
the behavior of the giflib, libpng, zlib, and freetype build
targets to require them to build statically. Also, the
skia_no_fontconfig variable turns off use of the fontconfig service.
Scripts in platform_tools/barelinux/bin:
arm64_download - this script downloads the Linaro's ARMv8 Aarch64
toolchain and minimal embedded Linux system as well as ARM's
foundation model. The required files are mirrored on Google
Cloud. The script then starts a emulated Arm64 Linux system in
the background. After the boot is complete, you can SSH into the
system at port 8022 via user@localhost. The SSH key will be
downloaded into the working directery as well.
download_deps - Uses gclient to download Skia's dependencies for a
bare Linux system (the normal dependecies plus giflib, libpng, and
zlib.)
barelinux_make - this script builds a version of skia that does
not depend on external libraries, perfect for putting in an
embedded system running Linux. Assumes you have run download_deps
first.
To test:
To build a barelinux target, use the barelinux_make script.
To build for a armv8 system: skia_arch_type=arm arm_neon=0 armv7=1
armv8=1 arm_thumb=0 skia_arch_width=64 and set the CC and CXX
variables to point at the cross-compiler downloaded by
arm64_download.
R=djsollen@google.com , scroggo@google.com , borenet@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/152513007
git-svn-id: http://skia.googlecode.com/svn/trunk@13570 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 20:22:34 +00:00
commit-bot@chromium.org
fe42410103
Fix NaCl build for pepper_32
...
BUG=skia:
R=rmistry@google.com , djsollen@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/171233015
git-svn-id: http://skia.googlecode.com/svn/trunk@13523 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-21 00:40:16 +00:00
commit-bot@chromium.org
e734c15aeb
fix debugging script for the SampleApp
...
R=scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/164773002
git-svn-id: http://skia.googlecode.com/svn/trunk@13444 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-13 22:31:48 +00:00
commit-bot@chromium.org
8933563174
Scripts to generate Android.mk for framework Skia.
...
In order to create Android.mk, run
>> python platform_tools/android/bin/gyp_to_android.py
For the change in the Android.mk file, see
https://googleplex-android-review.git.corp.google.com/#/c/408170/
(SkipBuildbotRuns)
BUG=skia:1975
R=djsollen@google.com , epoger@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/140503007
git-svn-id: http://skia.googlecode.com/svn/trunk@13344 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-06 16:13:00 +00:00
commit-bot@chromium.org
495157b991
Fix SampleApp for devices who don't support the full OpenGL API
...
R=bsalomon@google.com , ernstm@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/137223006
git-svn-id: http://skia.googlecode.com/svn/trunk@13322 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-05 16:39:41 +00:00
commit-bot@chromium.org
db009577ad
fix script so that the error is actually printed if ant is not installed
...
R=scroggo@google.com , hcm@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/148793003
git-svn-id: http://skia.googlecode.com/svn/trunk@13290 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-03 21:20:09 +00:00
commit-bot@chromium.org
32678d9a45
use some helper Make functions to initialize SkImageInfo
...
BUG=
R=halcanary@google.com , scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/137993012
git-svn-id: http://skia.googlecode.com/svn/trunk@13081 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 02:38:22 +00:00
borenet@google.com
6f0f5b4aad
Remove references to Skia's SVN repository
...
BUG=
R=epoger@google.com
Review URL: https://codereview.chromium.org/132423002
git-svn-id: http://skia.googlecode.com/svn/trunk@13006 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 21:41:39 +00:00
commit-bot@chromium.org
a3b84d41ef
Support MSAA4 and (non-ES) OpenGL in Android SampleApp
...
Add a menu item to set the OpenGL context type that SampleApp uses on
Android. The submenu of the new item will present options to create
OpenGL ES or OpenGL, aliased or multisampled.
R=djsollen@google.com , bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/60273006
git-svn-id: http://skia.googlecode.com/svn/trunk@12610 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10 20:37:41 +00:00
commit-bot@chromium.org
b6872c06e1
Add support for MIPS to android build
...
R=borenet@google.com , scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/109323004
git-svn-id: http://skia.googlecode.com/svn/trunk@12592 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10 12:53:56 +00:00
djsollen@google.com
0e9297c7bd
update android build to use SDK API level 19.
...
BUG=1817
Review URL: https://codereview.chromium.org/88223002
git-svn-id: http://skia.googlecode.com/svn/trunk@12504 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-05 13:57:54 +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
commit-bot@chromium.org
7578b3efc6
Add logan to android_setup.sh
...
R=djsollen@google.com , bsalomon@google.com , robertphillips@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/82523006
git-svn-id: http://skia.googlecode.com/svn/trunk@12383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 18:54:44 +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
djsollen@google.com
692f88c7f0
Add extra warnings to match what Android uses.
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/74193005
git-svn-id: http://skia.googlecode.com/svn/trunk@12310 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-20 13:16:47 +00:00
commit-bot@chromium.org
7507276d86
Fix installing the release build sample app apk
...
The android_setup.sh parses command line arguments and stores the ones
it does not use to APP_ARGS variable.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/61553002
git-svn-id: http://skia.googlecode.com/svn/trunk@12153 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-06 15:01:37 +00:00
commit-bot@chromium.org
ecdb6b326f
Make it possible to pass GYP_DEFINES to Android builds
...
Pass possibly existing GYP_DEFINES from shell to gyp when building
for Android. Makes it possible to use custom build flags such as
skia_nv_path_rendering=1.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/51003007
git-svn-id: http://skia.googlecode.com/svn/trunk@12128 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-05 15:03:19 +00:00
reed@google.com
2bd8b81005
move SkImage::ColorType into SkColorType
...
objective -- move clients over to SkImage
tasks
- use SkImageInfo instead of SkBitmap::Config
- add support for colortables to SkImage
- add drawImage to SkCanvas
- return SkImage from readPixels
This CL works towards the first task
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/54363008
git-svn-id: http://skia.googlecode.com/svn/trunk@12077 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-01 13:46:54 +00:00
robertphillips@google.com
4e5559af89
Allow specifying the max texture count on the bots
...
https://codereview.chromium.org/50413011/
git-svn-id: http://skia.googlecode.com/svn/trunk@12020 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-30 17:04:16 +00:00
djsollen@google.com
97f0beefe5
fix android_gdb_exe script
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/26871003
git-svn-id: http://skia.googlecode.com/svn/trunk@11706 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-10 17:41:32 +00:00
djsollen@google.com
3702b2587c
Fix ninja build on Android
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/25535002
git-svn-id: http://skia.googlecode.com/svn/trunk@11555 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-01 15:31:54 +00:00
mtklein@google.com
fe21538138
fix the android build. now both android_ninja _and_ android_make work.
...
BUG=
Review URL: https://codereview.chromium.org/25319003
git-svn-id: http://skia.googlecode.com/svn/trunk@11542 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 20:58:48 +00:00
mtklein@google.com
cf0573fc69
VERBOSE -> SKIA_ANDROID_VERBOSE_SETUP
...
BUG=
R=borenet@google.com
Review URL: https://codereview.chromium.org/25269008
git-svn-id: http://skia.googlecode.com/svn/trunk@11541 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 20:53:36 +00:00
mtklein@google.com
1c4015ab14
make vanilla android_ninja work, and add quiet options
...
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/25275006
git-svn-id: http://skia.googlecode.com/svn/trunk@11540 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 20:42:10 +00:00
djsollen@google.com
0b499ae6ba
Remove uneeded copy of gdbserver from apk
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/25336002
git-svn-id: http://skia.googlecode.com/svn/trunk@11539 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 20:33:21 +00:00
mtklein@google.com
efcef6a7cb
fix Android release builds
...
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/25300005
git-svn-id: http://skia.googlecode.com/svn/trunk@11535 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 19:23:05 +00:00
djsollen@google.com
06b7209ef7
remove unecessary warnings from third_party code
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/25030003
git-svn-id: http://skia.googlecode.com/svn/trunk@11529 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 18:06:34 +00:00
mtklein@google.com
48f9e1f2c1
Add android_ninja, like android_make for ninja.
...
android_ninja {tests,bench,gm,bench_pictures,render_pictures} all build and run
fine. They build so fast I thought maybe they were broken.
Note that android_ninja with no argument is failing:
ninja: Entering directory `out/config/android-arm_v7_thumb/Debug'
ninja: error: 'lib.target/libSampleApp.so', needed by 'android/libs/armeabi-v7a/libSampleApp.so', missing and no known rule to make it
Will look into this.
BUG=
R=djsollen@google.com
Committed: https://code.google.com/p/skia/source/detail?r=11525
Review URL: https://codereview.chromium.org/24833002
git-svn-id: http://skia.googlecode.com/svn/trunk@11527 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 17:32:09 +00:00
mtklein@google.com
741ea9e009
Revert "Add android_ninja, like android_make for ninja."
...
Broke some builds. Will try again.
BUG=
Review URL: https://codereview.chromium.org/25307002
git-svn-id: http://skia.googlecode.com/svn/trunk@11526 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 17:22:48 +00:00
mtklein@google.com
9eecef0744
Add android_ninja, like android_make for ninja.
...
android_ninja {tests,bench,gm,bench_pictures,render_pictures} all build and run
fine. They build so fast I thought maybe they were broken.
Note that android_ninja with no argument is failing:
ninja: Entering directory `out/config/android-arm_v7_thumb/Debug'
ninja: error: 'lib.target/libSampleApp.so', needed by 'android/libs/armeabi-v7a/libSampleApp.so', missing and no known rule to make it
Will look into this.
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/24833002
git-svn-id: http://skia.googlecode.com/svn/trunk@11525 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-30 17:13:58 +00:00
borenet@google.com
c569327afb
Fix android_run_skia
...
If STATUS_FILENAME doesn't exist, exit 1.
R=djsollen@google.com , jvanverth@google.com
Review URL: https://codereview.chromium.org/24770002
git-svn-id: http://skia.googlecode.com/svn/trunk@11498 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-27 14:28:45 +00:00
reed@google.com
beb0c2aa32
use new globally scoped SkAlphaType
...
git-svn-id: http://skia.googlecode.com/svn/trunk@11424 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-20 20:05:01 +00:00
djsollen@google.com
3a98ed7658
various bug fixes.
...
1. update mac support for md5
2. update default build to be thumb
(SkipBuildbotRuns)
R=mtklein@google.com
Review URL: https://codereview.chromium.org/23514051
git-svn-id: http://skia.googlecode.com/svn/trunk@11201 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-11 16:56:20 +00:00
djsollen@google.com
40415c587d
fix error in android setup script
...
git-svn-id: http://skia.googlecode.com/svn/trunk@11074 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-04 13:49:30 +00:00
commit-bot@chromium.org
4020acfa7e
Fix android_run_skia
...
R=djsollen@google.com , mtklein@google.com
Author: borenet@google.com
Review URL: https://chromiumcodereview.appspot.com/22861030
git-svn-id: http://skia.googlecode.com/svn/trunk@10885 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-22 21:57:22 +00:00
djsollen@google.com
a61ba109bf
default to device type of last build if no device type is given
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/22929006
git-svn-id: http://skia.googlecode.com/svn/trunk@10807 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-20 12:22:57 +00:00
borenet@google.com
065224dbf3
Add Android config for Intel RHB
...
Corresponding buildbot change: https://codereview.chromium.org/22840005/
R=djsollen@google.com
Review URL: https://codereview.chromium.org/23046003
git-svn-id: http://skia.googlecode.com/svn/trunk@10699 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-13 20:32:22 +00:00
borenet@google.com
7ad39d3d25
Make android_run_skia exit with the correct code
...
R=djsollen@google.com
Review URL: https://codereview.chromium.org/22812003
git-svn-id: http://skia.googlecode.com/svn/trunk@10684 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12 17:21:43 +00:00
djsollen@google.com
cc95b1aeb8
Update Skia Android tools.
...
This CL moves the skia_launcher out of the system/bin and into
/data/local/tmp; removes the need to package our shared libs in an
apk; and updates all the scripts to work in the new environment.
R=mtklein@google.com , scroggo@google.com
Review URL: https://codereview.chromium.org/22617002
git-svn-id: http://skia.googlecode.com/svn/trunk@10673 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12 12:30:04 +00:00
borenet@google.com
7627535b8f
Re-organize Android scripts
...
Addresses https://code.google.com/p/skia/issues/detail?id=1486
R=djsollen@google.com
Review URL: https://codereview.chromium.org/22411004
git-svn-id: http://skia.googlecode.com/svn/trunk@10585 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 20:32:29 +00:00
borenet@google.com
112215acef
Move toolchain setup into a function in android_setup.sh
...
Addresses https://code.google.com/p/skia/issues/detail?id=1486
R=djsollen@google.com
Review URL: https://codereview.chromium.org/22339008
git-svn-id: http://skia.googlecode.com/svn/trunk@10563 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 15:42:15 +00:00
borenet@google.com
ef0893191a
Normalize indents in android_setup.sh
...
R=djsollen@google.com
Review URL: https://codereview.chromium.org/22422002
git-svn-id: http://skia.googlecode.com/svn/trunk@10560 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 13:47:54 +00:00
commit-bot@chromium.org
db5460bb79
add remote debugging support for x86 phone
...
R=djsollen@google.com , borenet@google.com
Author: yunchao.he@intel.com
Review URL: https://chromiumcodereview.appspot.com/19920003
git-svn-id: http://skia.googlecode.com/svn/trunk@10511 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 15:14:24 +00:00
djsollen@google.com
f7542ba18e
update gyp for ARM builds to be more well defined.
...
R=mtklein@google.com
Review URL: https://codereview.chromium.org/21096005
git-svn-id: http://skia.googlecode.com/svn/trunk@10454 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-31 12:57:27 +00:00
mtklein@google.com
72761f031f
ndk r8d->r8e, adding mips toolchain
...
tested:
platform_tools/android/bin/android_make -d nexus_4 -j 4 BUILDTYPE=Release && platform_tools/android/bin/android_make -d razr_i BUILDTYPE=Release -j 4 && echo "OK"
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/19670018
git-svn-id: http://skia.googlecode.com/svn/trunk@10435 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-30 14:14:14 +00:00
commit-bot@chromium.org
05256f6811
set a correct breakpoint for gdbserver, gdb can stop here before the app is running, and we can set more breakpoints if we need. For previous one, gdb will not stop, so it will run the app and exit.
...
R=djsollen@google.com , borenet@google.com
Author: yunchao.he@intel.com
Review URL: https://chromiumcodereview.appspot.com/20671002
git-svn-id: http://skia.googlecode.com/svn/trunk@10430 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-30 13:16:07 +00:00
mtklein@google.com
b3915b5a9f
Turn thumb back on.
...
We expect this might break Android GMs. If it does I'll rebaseline or revert.
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/21096004
git-svn-id: http://skia.googlecode.com/svn/trunk@10415 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-29 18:33:33 +00:00
djsollen@google.com
489ba1dac0
Update android_make to use arrays instead of space delimited strings
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/19796008
git-svn-id: http://skia.googlecode.com/svn/trunk@10230 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-22 14:18:08 +00:00
djsollen@google.com
cfe3c11c76
Revert "switch all the arm7 devices to build with thumb for a while"
...
This reverts r10028 which has altered the GM expectations.
R=caryclark@google.com
Review URL: https://codereview.chromium.org/18762006
git-svn-id: http://skia.googlecode.com/svn/trunk@10043 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-12 13:31:51 +00:00
commit-bot@chromium.org
d411681868
switch all the arm7 devices to build with thumb for a while
...
BUG=
R=djsollen@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/18563004
git-svn-id: http://skia.googlecode.com/svn/trunk@10028 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-11 20:28:38 +00:00
borenet@google.com
fa05719ce2
Make ChromeOS build exit nonzero on failure
...
R=djsollen@google.com
Review URL: https://codereview.chromium.org/18621004
git-svn-id: http://skia.googlecode.com/svn/trunk@10018 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-11 18:11:56 +00:00
commit-bot@chromium.org
ab4098b4d3
add _thumb variants for arm devices
...
BUG=
R=djsollen@google.com
Author: mtklein@google.com
Review URL: https://chromiumcodereview.appspot.com/19024002
git-svn-id: http://skia.googlecode.com/svn/trunk@10001 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-11 13:57:29 +00:00
scroggo@google.com
6c4c3a5554
Fixes for nacl_debugger's use of picture.
...
Now that CreateFromStream is used, check for NULL rather than
looking at width and height (prevents a crash on an invalid SKP).
Unref the picture when done with it.
Remove the member variable for picture, since it is only accessed
inside the one function.
R=borenet@google.com
Review URL: https://codereview.chromium.org/18055014
git-svn-id: http://skia.googlecode.com/svn/trunk@9831 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-01 12:42:49 +00:00
scroggo@google.com
1e34b34a6c
Use CreateFromStream in nacl debugger.
...
Review URL: https://codereview.chromium.org/18153012
git-svn-id: http://skia.googlecode.com/svn/trunk@9824 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-28 21:57:51 +00:00
djsollen@google.com
121b3fe6a0
Add MD5 support when syncing debug files and option to just start gdbserver
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/17910006
git-svn-id: http://skia.googlecode.com/svn/trunk@9791 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-27 13:43:04 +00:00
borenet@google.com
79fb9c085c
Disable Goma for ChromeOS build
...
Doesn't work on VMs.
(RunBuilders:Build-Ubuntu12-GCC-x86-Debug-Alex,Build-Ubuntu12-GCC-x86-Release-Alex)
R=djsollen@google.com
Review URL: https://codereview.chromium.org/17688005
git-svn-id: http://skia.googlecode.com/svn/trunk@9754 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-25 19:26:11 +00:00
commit-bot@chromium.org
2c47505671
Remove no longer needed stuff from chromeos build script, always run gyp
...
(RunBuilders:Test-ChromeOS-Alex-GMA3150-x86-Debug,Test-ChromeOS-Alex-GMA3150-x86-Release,Perf-ChromeOS-Alex-GMA3150-x86-Release)
R=djsollen@google.com
Author: borenet@google.com
Review URL: https://chromiumcodereview.appspot.com/17684002
git-svn-id: http://skia.googlecode.com/svn/trunk@9752 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-25 18:18:07 +00:00
borenet@google.com
bc4bed132f
Temporarily disable gpu on chromeos
...
Unreviewed.
(SkipBuildbotRuns)
Review URL: https://codereview.chromium.org/17611013
git-svn-id: http://skia.googlecode.com/svn/trunk@9747 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-25 13:14:38 +00:00
borenet@google.com
5bbf1d5260
Use a single cros_toolchain tarball for ChromeOS build
...
It's stored in our GS bucket, so we won't need two sets of credentials.
(SkipBuildbotRuns) since this isn't in use.
Review URL: https://codereview.chromium.org/17608003
git-svn-id: http://skia.googlecode.com/svn/trunk@9743 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-24 19:31:58 +00:00
borenet@google.com
68b5bae2bc
Allow specification of a non-default boto file in chromeos_make
...
This is needed because our GS bucket needs a different auth key from the
ChromeOS bucket.
(SkipBuildbotRuns)
R=epoger@google.com
Review URL: https://codereview.chromium.org/16975017
git-svn-id: http://skia.googlecode.com/svn/trunk@9692 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-19 19:44:18 +00:00
borenet@google.com
5ec130524e
Use "Simple Chrome for Chrome OS Workflow" to build Skia for ChromeOS
...
(SkipBuildbotRuns) since this isn't used yet.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/17412007
git-svn-id: http://skia.googlecode.com/svn/trunk@9681 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-19 15:13:32 +00:00
borenet@google.com
bb52288882
SkHello for NaCl
...
Not ready to submit.
R=reed@google.com
Review URL: https://codereview.chromium.org/16904003
git-svn-id: http://skia.googlecode.com/svn/trunk@9639 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-17 15:39:43 +00:00
borenet@google.com
05d550ed36
GYP Changes and Scripts for Compiling Skia for ChromeOS
...
For now, this requires having a complete ChromeOS checkout.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/16099011
git-svn-id: http://skia.googlecode.com/svn/trunk@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-11 15:52:19 +00:00
djsollen@google.com
fe26fb6142
add launcher icon for android hello_skia_app
...
R=zachr@google.com
Review URL: https://codereview.chromium.org/16452005
git-svn-id: http://skia.googlecode.com/svn/trunk@9444 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-05 15:44:16 +00:00
commit-bot@chromium.org
ecaa59d878
create simple skia app for android using jni
...
R=djsollen@google.com
Author: zachr@google.com
Review URL: https://chromiumcodereview.appspot.com/16336004
git-svn-id: http://skia.googlecode.com/svn/trunk@9437 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-04 21:13:11 +00:00
djsollen@google.com
0274f93104
update android_gdb_exe to work with skia shared lib
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/16140013
git-svn-id: http://skia.googlecode.com/svn/trunk@9404 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 16:02:22 +00:00
djsollen@google.com
ecde97ef48
yet another build fix for skia_launcher
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/15969009
git-svn-id: http://skia.googlecode.com/svn/trunk@9402 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 14:51:14 +00:00
djsollen@google.com
e69a54b0bc
fix broken skia_launcher app
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/15995008
git-svn-id: http://skia.googlecode.com/svn/trunk@9399 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 14:02:15 +00:00
djsollen@google.com
52f0297aaf
Prepare skia for shared library build on android
...
This reapplies revision 9378 after the buildbot has been updated.
R=borenet@google.com , djsollen@google.com
Review URL: https://codereview.chromium.org/15855006
git-svn-id: http://skia.googlecode.com/svn/trunk@9395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-06-03 12:10:19 +00:00
djsollen@google.com
a96627fd24
prepare skia for shared library build on android
...
R=borenet@google.com , djsollen@google.com
Committed: https://code.google.com/p/skia/source/detail?r=9378
Review URL: https://codereview.chromium.org/15855006
git-svn-id: http://skia.googlecode.com/svn/trunk@9379 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:09:47 +00:00
djsollen@google.com
cf5348f5aa
prepare skia for shared library build on android
...
R=borenet@google.com , djsollen@google.com
Review URL: https://codereview.chromium.org/15855006
git-svn-id: http://skia.googlecode.com/svn/trunk@9378 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-31 20:02:56 +00:00
commit-bot@chromium.org
6320e8f393
Remove dependency of gsutil to download ndk
...
Currently we use gsutil to download ndk. However, it requires extra
steps to install, and is not convenient to configure (several steps to
enable Google storage), especially for developers behind proxy (need to
set config of boto). Chromium provides some python scripts to help
download nacl toolchains that can meet this need well. So this patch
basically borrows two python scripts from there, and makes some
according changes to remove the usage of gsutil. With new script, we may
also implement some advanced features, such as hash check, so that the
download would be more intelligent.
BUG=
R=djsollen@google.com , borenet@google.com , reed@google.com
Author: yang.gu@intel.com
Review URL: https://chromiumcodereview.appspot.com/15951008
git-svn-id: http://skia.googlecode.com/svn/trunk@9311 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-29 13:26:32 +00:00
borenet@google.com
8371e704b7
Fix android_run_skia to work with multiple attached devices
...
(SkipBuildbotRuns)
R=djsollen@google.com
Review URL: https://codereview.chromium.org/15199005
git-svn-id: http://skia.googlecode.com/svn/trunk@9167 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-16 18:12:34 +00:00
commit-bot@chromium.org
05403dfe24
Remove the fno-rtti excluders now that fno-rtti is only passed to c++ files.
...
R=djsollen@google.com
Author: bungeman@google.com
Review URL: https://chromiumcodereview.appspot.com/15210003
git-svn-id: http://skia.googlecode.com/svn/trunk@9165 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-16 14:53:28 +00:00
borenet@google.com
da5e6e9098
Use exportVar function in nacl_make
...
Dumps out the variables as they are defined for debugging
(SkipBuildbotRuns)
R=djsollen@google.com
Review URL: https://codereview.chromium.org/14655006
git-svn-id: http://skia.googlecode.com/svn/trunk@9010 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-06 13:49:41 +00:00
borenet@google.com
6a98b8c0b5
Copy NaCl directory into trunk/platform_tools, adjust paths
...
(SkipBuildbotRuns)
R=djsollen@google.com
Review URL: https://codereview.chromium.org/14771017
git-svn-id: http://skia.googlecode.com/svn/trunk@9008 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-06 12:50:00 +00:00
djsollen@google.com
c772540b4c
fix copy-paste error in setup script
...
BUG=
Review URL: https://codereview.chromium.org/14646027
git-svn-id: http://skia.googlecode.com/svn/trunk@8985 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-03 14:21:35 +00:00
djsollen@google.com
d165de44c8
Check for third_party deps before compiling on android
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/14803004
git-svn-id: http://skia.googlecode.com/svn/trunk@8984 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-03 14:12:03 +00:00
djsollen@google.com
ce3d223cfe
update recommended gclient config for android
...
Review URL: https://codereview.chromium.org/14857007
git-svn-id: http://skia.googlecode.com/svn/trunk@8964 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-02 18:42:10 +00:00
djsollen@google.com
4b32101a15
Update DEPS and GYP to use the copy of Android in platform_tools.
...
R=borenet@google.com
Review URL: https://codereview.chromium.org/13898019
git-svn-id: http://skia.googlecode.com/svn/trunk@8951 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-05-02 12:27:21 +00:00
borenet@google.com
ffca502023
Resubmit r8929 with the duplicated change in trunk/platform_tools/android
...
Unreviewed.
(SkipBuildbotRuns)
Review URL: https://codereview.chromium.org/14652007
git-svn-id: http://skia.googlecode.com/svn/trunk@8930 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-30 16:37:30 +00:00
skia.committer@gmail.com
8152113073
Sanitizing source files in Skia_Periodic_House_Keeping
...
git-svn-id: http://skia.googlecode.com/svn/trunk@8919 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-30 07:01:03 +00:00
djsollen@google.com
dcdd57faf0
Copy the top level Android directory into trunk.
...
This CL is the first step in a series needed to move the
android directory into trunk. After the copy we will update
GYP and DEPS to point to the new location and only then
remove the original directory.
git-svn-id: http://skia.googlecode.com/svn/trunk@8891 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-04-29 12:09:31 +00:00