Commit Graph

78 Commits

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