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
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
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
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