Commit Graph

460 Commits

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