AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,841 Commits 1 Branch 0 Tags 544 MiB
858baf5b7d
Commit Graph

147 Commits

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