Commit Graph

149 Commits

Author SHA1 Message Date
borenet
ad54ffc235 adb_wait_for_device: Skip adb wait-for-device
This should still wait for the device to be attached and finished
booting, but will prevent no-output timeouts due to
`adb wait-for-device` never finishing.

The effect should be that, when an Android device is disconnected, the
"wait for device" step will run forever, or until the device
reconnects. This should prevent a disconnected device from spreading
purple all over the status page.

BUG=skia:

Review URL: https://codereview.chromium.org/1315753010
2015-09-03 10:41:07 -07:00
borenet
89971d4537 Use a different download URL for Android toolchains
The current one isn't working on the Appurify bot

BUG=skia:4093

Review URL: https://codereview.chromium.org/1311533006
2015-08-31 08:35:32 -07:00
djsollen
3a26fc8e9a Ensure that android "release" apps are signed with debug key
Review URL: https://codereview.chromium.org/1275223003
2015-08-10 08:58:04 -07: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
borenet
850bbf1bb6 Add android_run_app.go
Launches an app, pipes its output, and exits when the app exits.

Loosely based on the old buildbot code in python:
https://skia.googlesource.com/buildbot/+/ac0663c599a443a4958c8cad5aefd25eb09eff58/slave/skia_slave_scripts/utils/android_utils.py

BUG=skia:4093

Review URL: https://codereview.chromium.org/1256353002
2015-07-31 04:13:38 -07:00
borenet
b2c07364a3 Fix android_launch_app after Gradle change
NOTRY=true
TBR=djsollen
BUG=skia:

Review URL: https://codereview.chromium.org/1258253002
2015-07-28 06:00:36 -07:00
borenet
5f4dc38325 android_install_app: Use lower-cased app name
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1261873002
2015-07-28 05:13:41 -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
msarett
cf2a6a47e4 Reenable yasm for Android x86 and x86-64 on Linux host
It turns out that gyp (kind of) has support for cross
compiling with a different host and target.  We simply
need to specify CC_host and CC_target instead of CC.

Making this change allows us to compile yasm on a Linux
host for Android.

We run into problems on Mac because
the linker on a Mac host requires different command line
arguments than the linker on the Android target.  In
looking through the code for gyp itself and speaking to
Ben, it doesn't appear to me that gyp supports passing
different arguments to host and target linkers.

I would imagine that we would have similar problems on
Windows.

Below is a link to a CL that would fix this issue in gyp.
It looks like it has been dropped for a long time.
Thanks to Ben for this link!
https://chromiumcodereview.appspot.com/10795044/

Also I'm adding a link to the build instructions for Chrome
(thanks again Ben).  It looks like they only support
building for Android from Linux.
https://code.google.com/p/chromium/wiki/AndroidBuildInstructions

My next steps are:
1) Getting in touch with Torne or someone else with gyp to
see if people are aware of this issue or interested in
fixing it.
2) Deciding if skia should care about this issue.
3) Deciding if skia should work around this issue.

It'd be really great to hear your thoughts on (2) and (3).
My first thought is that we shouldn't care because, as
long as we always compile the production copy of skia for
Android on Linux, we will get the fast code.  Is this
a valid conclusion?  Is there a way to write Android apps
on Mac that accidentally use the slower code?

If we do care, there are workarounds:
For Mac, we can check in a yasm binary - it's a little
smaller than the one I am deleting in this CL :-/
For Windows, we *might* be able to use the yasm.exe binary
already in externals (we get this from DEPS because this is
how chromium uses yasm on Windows).
Are there other platforms that we care about?

Let me know what you think!

BUG=skia:4028
DOCS_PREVIEW= https://skia.org/?cl=1239333002

Review URL: https://codereview.chromium.org/1239333002
2015-07-21 12:01:48 -07:00
joshualitt
dcd56e2f0e Fix for android command line arguments to VisualBench
BUG=skia:

Review URL: https://codereview.chromium.org/1241923002
2015-07-15 10:17:21 -07:00
scroggo
33d35263bf Move android_gdb_tmp into out/
This way it will be ignored.

Review URL: https://codereview.chromium.org/1230773003
2015-07-10 11:05:10 -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
joshualitt
01f38915e1 Fixup android launch script to launch VisualBench as well as SampleApp
BUG=skia:

Review URL: https://codereview.chromium.org/1185473003
2015-06-22 05:39:32 -07:00
joshualitt
74953c388c Modify android_install_app to install VisualBench
BUG=skia:

Review URL: https://codereview.chromium.org/1181973008
2015-06-18 13:08:26 -07:00
msarett
b3ec76b34f Update android perf script
BUG=skia:

Review URL: https://codereview.chromium.org/1185293006
2015-06-18 06:29:48 -07:00
djsollen
f793cd0913 Print command to be executed in verbose mode
Review URL: https://codereview.chromium.org/1180163002
2015-06-12 10:50:53 -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
5aa5ea3831 Add adb_wait_for_device script
BUG=skia:3718

Review URL: https://codereview.chromium.org/1149163003
2015-06-02 12:38:16 -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
msarett
114912d4b9 Fix android_run_skia script to allow for larger blacklist
BUG=skia:

Review URL: https://codereview.chromium.org/1011653004
2015-03-25 12:28:33 -07:00
djsollen
176cd92a61 Allow either the old or new version of ADB on mac.
Review URL: https://codereview.chromium.org/926003002
2015-02-19 18:39:40 -08: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
djsollen
6429fd1e41 Cleanup the android scripts.
Rename a few files to make their function clearer.
Update other files to remove dead code or improve function.

Review URL: https://codereview.chromium.org/865943007
2015-02-03 15:07:30 -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
scroggo
8fd8d38626 Add ability to specify gyp dir to gyp_to_android.
When running gyp_to_android inside a Skia tree, it uses the gyp program
in third_party/externals. Inside an Android tree, we need to use a
different location for gyp (the Android copy of Skia, in external/skia,
does not contain third_party/externals).

The bot handles this by importing gyp_to_android and running its main
function directly.

Add command line arguments so a human can directly run gyp_to_android.

Review URL: https://codereview.chromium.org/864503002
2015-01-20 10:39:25 -08:00
scroggo
c7bfd5b441 Stop building gm in Android framework build.
Allows us to delete gm.

Review URL: https://codereview.chromium.org/860803004
2015-01-20 08:25:36 -08:00
scroggo
09acfc8d1f Pass gyp_source_dir to generate_tool.
When generating the tool makefiles, which also calls
android_framework_gyp, we also need to pass the gyp directory.

TBR=borenet
NOTRY=True
NOTREECHECKS=True

BUG=skia:3233

Review URL: https://codereview.chromium.org/804473005
2014-12-12 09:01:56 -08:00
scroggo
60936c732b Add parameter to specify gyp dir to gyp_to_android.
NOTRY=true
NOTREECHECKS=True
BUG=skia:3233

Review URL: https://codereview.chromium.org/800573002
2014-12-11 13:05:14 -08:00
scroggo
8338a9a855 Reland "Move from libstlport to libc++ for Android framework builds" (patchset #1 id:1 of https://codereview.chromium.org/718793003/)
> Original issue's description:
> > Move from libstlport to libc++ for Android framework builds
> >
> > Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72
>
> TBR=tomhudson@google.com,djsollen@google.com
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: https://skia.googlesource.com/skia/+/3c3fe7ce4893204eb8bcf885e8a1d539763bca5d

TBR=tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/717303002
2014-11-12 11:52:23 -08:00
scroggo
3c3fe7ce48 Revert of Move from libstlport to libc++ for Android framework builds (patchset #1 id:1 of https://codereview.chromium.org/714113002/)
Reason for revert:
The code this depends on is not ready yet. We can submit once https://android-review.googlesource.com/#/c/113924/ is submitted.

Original issue's description:
> Move from libstlport to libc++ for Android framework builds
>
> Committed: https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72

TBR=tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/718793003
2014-11-11 13:58:44 -08:00
djsollen
ce259510a7 Move from libstlport to libc++ for Android framework builds
Review URL: https://codereview.chromium.org/714113002
2014-11-11 07:02:03 -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
djsollen
2550a7ed09 Remove adb from Skia repository
Review URL: https://codereview.chromium.org/696463003
2014-10-31 07:00:54 -07:00
djsollen
e228ba3e5c Update the Android NDK to r10c
Review URL: https://codereview.chromium.org/689943002
2014-10-30 13:27:26 -07:00
djsollen
f49bba8104 Use the most recent version of ADB from the SDK if necessary.
This removes ADB from the Skia checkout and also does some quick
checks to make sure the version of ADB used meets a minimum threshold

Review URL: https://codereview.chromium.org/692513003
2014-10-30 05:57:31 -07:00
djsollen
c96aa64246 Add a helper script to expose which version of adb the android scripts use.
Review URL: https://codereview.chromium.org/692633002
2014-10-29 12:59:50 -07:00
Derek Sollenberger
cd048d18e0 Update adb on linux to 1.0.32
Review URL: https://codereview.chromium.org/684203002
2014-10-29 11:41:17 -04:00
hcm
89e5caa6fb Revert of Update the Android NDK to r10c (patchset #1 id:1 of https://codereview.chromium.org/687603002/)
Reason for revert:
Spooky behavior on Nexus GPUs

Original issue's description:
> Update the Android NDK to r10c
>
> Committed: https://skia.googlesource.com/skia/+/a01a17b3f2f225d9499627e20f9b42ce351bd0eb

TBR=tomhudson@chromium.org,borenet@google.com,tomhudson@google.com,djsollen@google.com
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/685753003
2014-10-28 08:25:31 -07:00
djsollen
a01a17b3f2 Update the Android NDK to r10c
Review URL: https://codereview.chromium.org/687603002
2014-10-28 06:53:09 -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