Commit Graph

78 Commits

Author SHA1 Message Date
stani
a80bb676d3 Remove check for cmake in android make script.
Update docs explaining how to setup Android SDK.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2084763003
DOCS_PREVIEW= https://skia.org/?cl=2084763003

Review-Url: https://codereview.chromium.org/2084763003
2016-06-21 13:13:20 -07:00
mtklein
809ccf37ec Remove NEON runtime detection support.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1952953004
CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot

Review-Url: https://codereview.chromium.org/1952953004
2016-05-05 10:58:39 -07:00
djsollen
affacce4c6 Require Android SDK copy of CMake to build Vulkan on Android.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1930423002

Review-Url: https://codereview.chromium.org/1930423002
2016-04-29 08:09:43 -07:00
djsollen
d574c98c7d Make the default android build be release_developer.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1929663002

Review-Url: https://codereview.chromium.org/1929663002
2016-04-27 13:44:28 -07:00
djsollen
460f40507e Make clang the default Android compiler.
BUG=skia:5215
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1919873003

Review URL: https://codereview.chromium.org/1919873003
2016-04-25 11:45:35 -07:00
djsollen
12d62a7d51 VulkanViewer on Android
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003

Review URL: https://codereview.chromium.org/1903253003
2016-04-21 07:59:44 -07:00
rmistry
8ce5912fe3 Skip toolchain downloads for a few android tools.
This is an attempt to avoid downloading the android toolchain when not required.
I went through all binaries listed in https://code.google.com/p/chromium/codesearch#chromium/build/scripts/slave/recipe_modules/skia/android_flavor.py except for android_ninja.

BUG=skia:5119
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832883002

Review URL: https://codereview.chromium.org/1832883002
2016-03-28 09:35:41 -07:00
djsollen
42d95a0afb Fix gdb debugging for the latest NDK release.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1806343003

Review URL: https://codereview.chromium.org/1806343003
2016-03-17 10:45:47 -07:00
djsollen
f9deeb66d0 Update android_make to support both --gcc and --clang options.
This CL also fixes all the errors that resulted from compiling
with clang and ccache.

BUG=skia:4948
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774503004

Review URL: https://codereview.chromium.org/1774503004
2016-03-07 12:30:47 -08:00
mtklein
c34940ec16 Remove check for platform_tools/android/third_party/externals.
We don't sync anything into it anymore, so a fresh gclient sync won't create it.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1694813004

Review URL: https://codereview.chromium.org/1694813004
2016-02-12 12:54:15 -08:00
djsollen
5119ac069e Update Android Testing apps to support release mode
BUG=skia:4152

Review URL: https://codereview.chromium.org/1259123003
2015-07-31 10:25:17 -07:00
Brian Salomon
4239fc2f69 Remove skia_arch_width, fold into skia_arch_type.
DOCS_PREVIEW= https://skia.org/?cl=1228553010

BUG=skia:4042
R=borenet@google.com, mtklein@google.com

Review URL: https://codereview.chromium.org/1228553010
2015-07-27 09:10:36 -04:00
djsollen
d18b861061 Update Android Apps to use gradle
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Committed: https://skia.googlesource.com/skia/+/425535f1626932e4e22f61a2571f9c3c2b1c5977

Review URL: https://codereview.chromium.org/1215023017
2015-07-24 13:15:59 -07:00
joshualitt
9efef7b56f Revert "Update Android Apps to use gradle"
This reverts commit 425535f162.

NOTRY=true
NOTREECHECKS=true
TBR=djsollen@google.com
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1250233002

Review URL: https://codereview.chromium.org/1250233002
2015-07-23 08:00:33 -07:00
djsollen
425535f162 Update Android Apps to use gradle
This CL replaces ant with gradle for the task of building APKs.
The primary driver of this change is that it now allow us to
develop and test our apps using Android Studio.
DOCS_PREVIEW= https://skia.org/?cl=1215023017

Review URL: https://codereview.chromium.org/1215023017
2015-07-22 11:33:25 -07:00
scroggo
139491fbaa Use the upstream version of libwebp, v0.4.3.
DEPS:
Update to pull v0.4.3 of libwebp from upstream

gyp/libwebp.gyp:
Add new files, as referenced by the gyp file used by Chromium.

resource/tests:
Add regression tests for particular images.

BUG=skia:3442
BUG=skia:3315
BUG=skia:3429

Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1

Review URL: https://codereview.chromium.org/1178013008
2015-07-10 09:32:09 -07:00
djsollen
4e7956147d Android scripts now notify gyp that your building with clang
Review URL: https://codereview.chromium.org/1217443004
2015-06-26 11:03:56 -07:00
Derek Sollenberger
de50d9b942 fix broken build by not passing the verbose flag through
Review URL: https://codereview.chromium.org/1176543004
2015-06-10 15:58:48 -04:00
djsollen
46409de6ab Remove verbose bash logging
Review URL: https://codereview.chromium.org/1170283004
2015-06-10 12:37:56 -07:00
borenet
7ae68a8f8d Android scripts: add --verbose, fix missing 'source android_setup'
BUG=skia:3836
TBR=djsollen

Review URL: https://codereview.chromium.org/1145473002
2015-05-14 06:37:23 -07:00
Derek Sollenberger
7c722197b3 Add android_launch_app script to allow command line options to be passed to the sampleApp when starting.
BUG=skia:3815
DOCS_PREVIEW= https://skia.org/?cl=1136753003
R=bungeman@google.com, tomhudson@google.com

Review URL: https://codereview.chromium.org/1136753003
2015-05-11 08:54:19 -04:00
mtklein
5ae0e2b563 Default to arm_v7_neon.
This aliases all devices we know have NEON over to that too.

BUG=skia:

Review URL: https://codereview.chromium.org/1095953007
2015-04-21 14:25:34 -07:00
mtklein
2d33a1d0b0 Streamline Thumb config.
Enable Thumb2 iff ARM v7.  (We don't turn it on today for ARM <v7, and ARM v8 doesn't support it.)

BUG=skia:

Review URL: https://codereview.chromium.org/1054993002
2015-04-02 10:47:57 -07:00
djsollen
48c3534541 Update the Android scripts to refresh device names and capabilities.
Review URL: https://codereview.chromium.org/1054633002
2015-04-01 12:15:39 -07:00
scroggo
df1c3373fc Don't use m32 cflag for x86_64.
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.

Except when we specifically want x86.

Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.

In gyp_to_android.py, create a separate var_dict for x86_64.

BUG=skia:3419

Review URL: https://codereview.chromium.org/916113002
2015-02-12 10:48:25 -08:00
mtklein
2d63859f6f android_run_skia: dump logcat on failure
logcat -c clears the log before we run.
logcat -d dumps the log stdout and exits.

BUG=skia:

Review URL: https://codereview.chromium.org/870643002
2015-01-22 10:43:34 -08:00
djsollen
0130c30d0a Add support for clang to the android build scripts
Review URL: https://codereview.chromium.org/692953002
2014-10-31 07:00:59 -07:00
mtklein
f5b6bf775c Make -d x86 have the default GPU cache size.
We have no a priori reason to limit the cache for new devices.

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/556863006
2014-09-09 12:07:05 -07:00
borenet
77d724c078 Fix adb_pull_if_needed
BUG=skia:
R=djsollen@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/519743002
2014-08-29 07:56:14 -07:00
mtklein
7deeaf9521 add n5
NOTRY=true

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/506403004
2014-08-27 08:38:12 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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