AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,958 Commits 1 Branch 0 Tags 544 MiB
ace7f42769
Commit Graph

161 Commits

Author SHA1 Message Date
djsollen
0b17d6cb34 Cleanup public includes directory. 
This CL updates various files in the includes directory to ensure that (1) they do
not depend on headers in /src and (2) that they minimize their dependence on external
headers.

To ensure that we don't regress this behavior a new build target has been added to
build a single cpp file that contains all* public includes and is compiled with
only those directories in the include path.

* The exception is those includes that depend on OS specific headers

BUG=skia:2941
NOTRY=true

Review URL: https://codereview.chromium.org/721903002
 2014-11-13 12:52:35 -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
scroggo
978d37b343 Add LOCAL_PICKUP_FILES to dm and bench makefiles. 
Update the generator to include a line for LOCAL_PICKUP_FILES. When
generating makefiles for our tests, they will now have the following line:

LOCAL_PICKUP_FILES := \
    $(LOCAL_PATH)/../resources

This allows testing infrastructure to pick up resource files used by
our tests.

Update expectations files to test LOCAL_PICKUP_FILES.

BUG=skia:2454

Review URL: https://codereview.chromium.org/704393002
 2014-11-07 06:02:20 -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
Eric Boren
60d30548e8 Add Android copy_directory_contents_[to|from]_device scripts 
BUG=skia:
NOTRY=true
R=djsollen@google.com

Review URL: https://codereview.chromium.org/510653004
 2014-08-28 09:31:15 -04: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
djsollen
ed20c9b9c9 Fix root level Android.mk to now point to the correct nanobench makefile 
R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/494193003
 2014-08-21 13:12:34 -07:00
djsollen
8ebdd99bb1 Cleanup FDO options. 
R=tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/489373004
 2014-08-21 13:02:27 -07:00
djsollen
6bf35c2100 Update FDO options to match what is needed by the framework 
R=tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/497503003
 2014-08-21 07:38:31 -07:00
mtklein
0459cc732b Android.mk: bench_pictures -> nanobench 
We're only keeping bench_pictures around for the bots now.  For human-initiated work, nanobench is the way to go.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/484663002
 2014-08-18 08:44:54 -07:00
borenet
dc0fcbb925 Fix Android platform self-tests 
Remove things related to no-longer-existing unittests, run makefile_writer_tests --rebaseline

BUG=skia:2843
R=djsollen@google.com, scroggo@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/481943002
 2014-08-18 08:13:12 -07:00
Derek Sollenberger
c7f069b501 Fix Android framework builds 
R=mtklein@google.com

Review URL: https://codereview.chromium.org/450503002
 2014-08-06 16:31:41 -04:00
mtklein
be21e3432e Bye bye bench. 
NOTREECHECKS=true

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/442343004
 2014-08-06 08:39:38 -07:00
mtklein
d3d6b818c7 Stop building tests in the Android tree. 
BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/440653004
 2014-08-04 09:57:37 -07:00
djsollen
937fca8106 Add ability to generate/use FDO profiles for Android 
R=scroggo@google.com, bungeman@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/420803003
 2014-07-29 12:38:25 -07:00
djsollen
384b0202c0 Fix mac NDK builds 
R=jvanverth@google.com, scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/401613005
 2014-07-17 14:00:57 -07:00
qiankun.miao
ac298384b3 Fix warning about missing shared library symbols in android_gdbserver 
Grab related shared libraryies. Remove libcorkscrew.so due libcorkscrew
is removed from AOSP.

BUG=skia:
R=djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/399843002
 2014-07-17 08:18:23 -07:00
scroggo
3eb258d3f6 Generate makefile for bench_pictures. 
When generating Android framework makefiles, create one for
bench_pictures.

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

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/391423002
 2014-07-17 06:58:29 -07:00
qiankun.miao
d75547925d Make gdb work for 64-bit Skia 
BUG=skia:
R=djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/398733002
 2014-07-16 13:21:15 -07:00
scroggo
24b04fa2ad Alphabetize defines in generated SkUserConfig. 
When generating SkUserConfig.h for Android, alphabetize the defines.

This will make one merge much harder to look at, but every following
one much easier.

R=mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/388693003
 2014-07-14 10:22:02 -07:00
djsollen
f94bdb84ef explicitly add /data/local/tmp to the library path to support new AOSP restrictions 
BUG=skia:2660
R=tomhudson@chromium.org, tomhudson@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/387893003
 2014-07-11 08:47:23 -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
tomhudson
f9552230dc Add missing / in android_gdbserver 
Introduced in https://codereview.chromium.org/22617002, apparently
worked just fine, at least on already-set-up devices. Failing at
least since https://codereview.chromium.org/352303003/.

BUG=skia:2729
R=djsollen@google.com, tomhudson@google.com

Author: tomhudson@chromium.org

Review URL: https://codereview.chromium.org/372273003
 2014-07-08 12:29:54 -07:00
scroggo
f50a79366f Use BUILD_NATIVE_TEST instead of BUILD_EXECUTABLE. 
This will generate makefiles for our tools (bench, tests, gm, dm) using
the line "include $(BUILD_NATIVE_TEST)". This has been recommended by the
Android team, as it builds both 32 bit and 64 bit versions of the test.

Do not use LOCAL_MODULE_PATH, which is deprecated (see https://docs.google.com/a/google.com/document/d/1uLAuY7_KYGx1TSzJ9SXkyevT8qNpra2ZoIBkmCoq8VM/edit# ).

Corresponds to ag/498302 , which makes this change just for bench.

R=djsollen@google.com, halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/369673002
 2014-07-08 11:20:58 -07:00
Derek Sollenberger
6815011292 make skia_launcher be a position independent executable 
R=tomhudson@google.com

Review URL: https://codereview.chromium.org/374833003
 2014-07-08 08:26:21 -04:00
scroggo
950f89dd20 Specify the name of tool for creating a makefile. 
When generating tool Android.mks from gyp files, specify the name
of the target needed.

This fixes a bug where nanobench was being added to the same
makefile as bench, which would not compile.

TODO: Make gyp_to_android more general, so that it handles this
case better. See http://skbug.com/2709

R=mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/366653002
 2014-07-01 08:02:30 -07: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
mtklein
9ac68ee259 Move BenchTimer to tools as Timer 
This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Debug-iOS-Trybot,Test-Ubuntu12-ShuttleA-GTX660-x86-Debug-Trybot
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
 2014-06-20 11:29:21 -07:00
mtklein
9e64b78ff6 Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/) 
Reason for revert:
GpuTimer broken

Original issue's description:
> Move BenchTimer to tools as Timer
>
> This breaks a bunch of circular dependencies between tools and gm and bench.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/346753003
 2014-06-20 10:43:07 -07:00
mtklein
4ed75287ae Move BenchTimer to tools as Timer 
This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
 2014-06-20 10:31:49 -07:00
qiankun.miao
5102345029 Fix android_run_skia script running with command line options 
This script cannot recognize command line options when running bench:
e.g. android_run_skia bench --config 8888.

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

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/314903003
 2014-06-06 06:43:46 -07:00
scroggo
9de2fb680f Add mips64 to the makefile. 
Currently we have no optimizations for mips64, so it correctly
contains the various _none.cpps.

Corresponds to https://android-review.googlesource.com/#/c/96536/1

R=halcanary@google.com, djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/311163003
 2014-06-05 10:28:36 -07:00
scroggo
0ba5a4a306 Use tests tag for Skia tools on Android. 
When generating the makefiles for Skia testing tools on Android,
use the tag 'tests' and do not use the tags 'optional' or 'eng'.

R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/315013003
 2014-06-04 08:25:50 -07:00
mtklein
bec3634a4a Android: remove -lcutils dependency 
I believe we no longer depend on this after we ported our atomics to __sync.

Tested by running android_ninja.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/318493002
 2014-06-03 15:38:18 -07:00
scroggo
12ba2cbb9b Update expectations to fix self tests. 
R=epoger@google.com
TBR=epoger@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/306313004
 2014-06-02 13:34:08 -07:00
scroggo
b30aa62294 Update comments about debugging on master. 
Update the makefile to reference the correct location of
config.mk.

R=djsollen@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/308703009
 2014-06-02 07:19:13 -07:00
commit-bot@chromium.org
738a9218b8 If our gyp does not exist, use chromium's. 
The previous version had faith that if the third_party folder
existed, it must contain externals/gyp. A recent change added
third_party (in git, as opposed to using DEPS), so now Android
has third_party but not externals/gyp.

Now check the full filepath. If it's not there, back up to
chromium's version.

Fixes Android canary bot.

R=halcanary@google.com
TBR=halcanary@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/295103008

git-svn-id: http://skia.googlecode.com/svn/trunk@14855 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-22 19:30:54 +00:00
commit-bot@chromium.org
114487ceb4 Fix generation tests. 
R=epoger@google.com
TBR=epoger
NOTRY=true

BUG=skia:2565

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/284313007

git-svn-id: http://skia.googlecode.com/svn/trunk@14771 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-16 19:48:57 +00:00