AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
41,924 Commits 1 Branch 0 Tags 544 MiB
d2f2c04e7e
Commit Graph

209 Commits

Author SHA1 Message Date
Florin Malita
41005c3e80 Update android_build_app Gradle output location 
Looks like new Gradle (4.1) changed the output location from

  build/outputs/apk/{app}-{target_cpu}-{android_buildtype}.apk

to

  build/outputs/apk/{target_cpu}/{android_buildtype}/{app}-{target_cpu}-{android_buildtype}.apk

TBR=
Change-Id: I45ed38e1f1655f82ef4a205ef7e8baf3f2da50af
Reviewed-on: https://skia-review.googlesource.com/142806
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>
 2018-07-26 18:07:06 +00:00
Eric Boren
0f69010549 [recipes] BUILDTYPE and SKIA_OUT are no longer used 
Bug: skia:6473
Change-Id: I67b0dbf6dba26233df1d8e44f3e2f69ca0cc9d3e
Reviewed-on: https://skia-review.googlesource.com/128320
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
 2018-05-15 19:36:23 +00:00
Hal Canary
c5cf762177 Viewer/Amdroid: universal build, resources in APK 
Change-Id: I57dda6e3329dbee720333b6e92142fce28f8dbd3
Reviewed-on: https://skia-review.googlesource.com/111940
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Yuqian Li <liyuqian@google.com>
 2018-03-06 22:52:10 +00:00
Hal Canary
cfac205c5e android_build_app: optionally disable gradle daemon 
Motivation: sometimes the gradle daemon breaks things for me.

Change-Id: I920cd344a3b0f67cfa50529083fa7787d693637b
Reviewed-on: https://skia-review.googlesource.com/108564
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
 2018-02-20 17:14:33 +00:00
Hal Canary
c87fbf93d0 Android Tools: build x86_64 correctly. 
- Fix some naming confusion between `x64` and `x86-64`.
  - SkQP Universal (multi-arch apk) Build Script
    [tools/skqp/make_universal_apk]
  - skqp/build.gradle: add `universal` product flavor
  - skqp manifest:  make debug build optional.

No-Try: true
Change-Id: Ic8cd88719a34786ab2d53771749b2beb9db98be5
Reviewed-on: https://skia-review.googlesource.com/105023
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Stephan Altmueller <stephana@google.com>
 2018-02-09 22:13:23 +00:00
Hal Canary
ff2742eba8 SkQP: slim deps. Also skia_enable_fontmgr_empty 
Change-Id: I24ee2fb3a4a4ca03a60ee2f1a90e022825eee409
Reviewed-on: https://skia-review.googlesource.com/101820
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
 2018-01-30 18:57:45 +00:00
Mike Klein
f32b27d2e4 remove mips support and bots 
The NDK has deprecated mips and mips64:
https://developer.android.com/ndk/guides/abis.html

Might as well clean this up now while I remember.

Change-Id: Ie4b2334c75208082067cc16fe355d0349c7e0904
Reviewed-on: https://skia-review.googlesource.com/80560
Reviewed-by: Derek Sollenberger <djsollen@google.com>
 2017-12-05 17:19:45 +00:00
Hal Canary
a2e7f5ae10 android_build_app: fixes 
Change-Id: I2b643de2ede46472940da83d16cf9f8ebacc96db
Reviewed-on: https://skia-review.googlesource.com/80600
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
 2017-12-05 15:17:41 +00:00
Hal Canary
2287d64258 platform_tools/android/bin/android_gdbserver: fix error 
Change-Id: I8dc7522dad4433dff6a6d72fc13fecb1c1d5b9cd
Reviewed-on: https://skia-review.googlesource.com/59600
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
 2017-10-13 16:06:28 +00:00
Greg Daniel
23145a3c5c Updates to viewer gradle scripts 
BUG=skia:

Change-Id: Ib847e5ae89d2ac3f496507f69f82f5bac4914f36
Reviewed-on: https://skia-review.googlesource.com/8133
Reviewed-by: Chris Dalton <csmartdalton@google.com>
 2017-02-09 14:30:22 +00:00
Leon Scroggins III
fe8225802d Remove old generator code 
We're generating Android.bp from BUILD.gn, so no need for the old
version.

Change-Id: Ie5bcec1d4f15d0e9a178feb9191e42c872bd8e08
Reviewed-on: https://skia-review.googlesource.com/7639
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
 2017-01-27 19:10:49 +00:00
Derek Sollenberger
bfd2db8bfd Add support for 64-bit devices when using gdb on Android 
Change-Id: I25c230dc7f417f3e09a01011377e6e0c7814092a
Reviewed-on: https://skia-review.googlesource.com/6689
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
 2017-01-06 19:57:05 +00:00
Derek Sollenberger
6172d432ba Add a script and documentation for building the Viewer APK. 
BUG=skia:6009

DOCS_PREVIEW= https://skia.org/?cl=6660

Change-Id: Ibcf0d1e7f3519e703bc74f0329d0ac92110e70ec
Reviewed-on: https://skia-review.googlesource.com/6660
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
 2017-01-06 17:14:31 +00:00
Derek Sollenberger
70120c778a Add tools to support gdb and simpleperf for android executables. 
Change-Id: I6e7f41df094ae037538ebd61e40385d7e2e9eb26
Reviewed-on: https://skia-review.googlesource.com/6615
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
 2017-01-05 17:16:01 +00:00
Derek Sollenberger
dc71e152ef Update Android Apps to work with GN. 
This also includes the removal of an old example whose instructions
are not compatible with GN.

BUG=skia:6009

Change-Id: I2807829ca12c19292ae0f5a7ea250ed453f9a182
Reviewed-on: https://skia-review.googlesource.com/5620
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
 2017-01-04 19:38:34 +00:00
Derek Sollenberger
78b35230aa Archive or update unsupported Android scripts and third-party dependencies. 
- nothing uses ashmem;
  - cpufeatures and native_app_glue are now pulled from the NDK;
  - no bots use the scripts in platform_tools/android/bin;
  - update scripts to work with GN instead of GYP.

Change-Id: I14f47eeadb3047505e232dd10385f58ef12c73f4
Reviewed-on: https://skia-review.googlesource.com/5422
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
 2016-12-02 14:11:24 +00:00
branimir.vasic
5c2310c86d Add mips dsp arch variants to gyp_to_android.py. 
Fixes Android  build for variants mips32r2dsp-fp and mips32r2dspr2-fp by
enabling correct Android.mk file generation.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2359793002

Review-Url: https://codereview.chromium.org/2359793002
 2016-09-27 07:37:20 -07:00
kjlubick
b4403ee980 Fix strange failures on Android N 
We were seeing problems where dm ended with exit code 0, but the step still failed.
It seems they changed what N returns when a thing completes.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319843003
TBR=bugsbunny

Review-Url: https://codereview.chromium.org/2319843003
 2016-09-08 13:04:31 -07:00
liyuqian
e7d15fe870 Update documents/scripts for SampleApp removal 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2140663002
DOCS_PREVIEW= https://skia.org/?cl=2140663002

Review-Url: https://codereview.chromium.org/2140663002
 2016-07-12 09:12:39 -07:00
mtklein
f3bc76a12a Fix MIPS32r2 + DSP2 builders after NDK update. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2141643002

TBR=djsollen@google.com

CQ_INCLUDE_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-MipsDSP2-Debug-Android-Trybot,Build-Ubuntu-GCC-MipsDSP2-Release-Android-Trybot

Review-Url: https://codereview.chromium.org/2141643002
 2016-07-11 10:30:19 -07:00
mtklein
8a6d23257e ndk: r11c -> r12b 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2140603002

Review-Url: https://codereview.chromium.org/2140603002
 2016-07-11 08:27:43 -07:00
benjaminwagner
d48e5b8640 Check for empty output in adb_wait_for_charge. 
Example error in https://chromium-swarm.appspot.com/user/task/2f96d6439584e411

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2105813003

Review-Url: https://codereview.chromium.org/2105813003
 2016-06-29 07:02:54 -07:00
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
brianosman
28215d44b3 Support running Viewer via android_gdb_app 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2055453003

Review-Url: https://codereview.chromium.org/2055453003
 2016-06-08 13:07:08 -07:00
brianosman
0dd9f2cbc4 Fix argument parsing in android app launcher script 
Makes the argument match the error message that gets printed (and users'
expectations).

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2030123002

Review-Url: https://codereview.chromium.org/2030123002
 2016-06-02 11:44:06 -07:00
djsollen
4145792736 Remove VisualBench and its Android implementation. 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018603003

Review-Url: https://codereview.chromium.org/2018603003
 2016-05-27 05:39:29 -07:00
djsollen
3be9923105 Fix android scripts now that the $HOST is always lowercase. 
BUG=skia:5309
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1992873003

Review-Url: https://codereview.chromium.org/1992873003
 2016-05-20 07:03:17 -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
3a6aa4ceda Update gdb_app script to work with NDK r11c 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1936163002

Review-Url: https://codereview.chromium.org/1936163002
 2016-05-02 09:19:59 -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
borenet
8795962baf Stop printing warnings about ADB version 
BUG=skia:5156
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927973002

Review-Url: https://codereview.chromium.org/1927973002
 2016-04-28 09:31:38 -07:00
borenet
ef77ce9000 adb_wait_for_charge: Don't download toolchains 
BUG=skia:5156
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1926833003

Review-Url: https://codereview.chromium.org/1926833003
 2016-04-27 13:44:57 -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
djsollen
382949db14 Update android toolchain variable to point to root dir and not the bin 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1900773002

Review URL: https://codereview.chromium.org/1900773002
 2016-04-18 11:01:02 -07:00
kjlubick
312398159c Add support for pyadb to setup_adb.sh 
BUG=skia:5156
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1869813002

Review URL: https://codereview.chromium.org/1869813002
 2016-04-07 10:57:27 -07:00
mtklein
8c13cd1aba Another NDK release. Still just bug fixes. 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1864073002

Review URL: https://codereview.chromium.org/1864073002
 2016-04-06 06:12:01 -07:00
kjlubick
e577693b3b Prevent waiting for charge twice 
BUG=skia:5111
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1840003002

Review URL: https://codereview.chromium.org/1840003002
 2016-03-29 05:50:41 -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
kjlubick
face88a8ce Forward serial (fixes charging) 
NOTRY=true
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1832103002

Review URL: https://codereview.chromium.org/1832103002
 2016-03-25 09:47:55 -07:00
kjlubick
73233a7575 patch battery charging until recipe is updated 
BUG=skia:5111
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1834793003

Review URL: https://codereview.chromium.org/1834793003
 2016-03-25 05:53:58 -07:00
kjlubick
2e59f1f2fd Splitting up wait_for_device into two pieces 
BUG=skia:5111
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1829753004

Review URL: https://codereview.chromium.org/1829753004
 2016-03-25 05:22:40 -07:00
mtklein
1215c6ac94 NDK: r11 -> r11b 
Just bug fixes.  Nothing terribly exciting.

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

Review URL: https://codereview.chromium.org/1825213007
 2016-03-24 06:44:03 -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
b3b6beae04 Cleanup download scripts related to new Android NDK. 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810603002

Review URL: https://codereview.chromium.org/1810603002
 2016-03-16 08:48:58 -07:00
mtklein
e2a88f244a Android NDK: r10e -> r11 
I have tested that skia_lib builds with {gcc,clang} x {arm_v7_neon,arm64} on my Mac.
Bots seem happy.

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

Review URL: https://codereview.chromium.org/1780223002
 2016-03-10 08:41:34 -08: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
2a8fcb4647 Update Android framework makefile to build static and shared libs 
Also use static lib for testing tools and expose includes needed for
other framework testing tools to statically link in Skia.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1696483002

Review URL: https://codereview.chromium.org/1696483002
 2016-02-12 08:44:39 -08:00