AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,787 Commits 1 Branch 0 Tags 544 MiB
c2d6a20ef8
Commit Graph

103 Commits

Author SHA1 Message Date
commit-bot@chromium.org
c2d6a20ef8 Improve Android gdbserver and gdb_ex scripts 
- Don't complain if $GDB_TMP_DIR already exists
- Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file.

NOTRY=true
R=djsollen@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14503 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-01 15:34:28 +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
b0ba9f8b1d make gitignore happy with symlinks 
See https://codereview.chromium.org/139473002 for similar CL.

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

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14484 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-30 19:55:51 +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
19a21894ea android_gdbserver - fix warning about missing shared library symbols 
The warning was:
	warning: Could not load shared library symbols for 4 libraries,
	e.g. /system/bin/linker.  Use the "info sharedlibrary" command to
	see the complete listing.

Fixed by grabbing all of those libraries along with libc.so.

NOTRY=true
R=scroggo@google.com, djsollen@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14441 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-29 19:04:21 +00:00
commit-bot@chromium.org
a3987574c8 Explicitly include gyp_gen/android_framework_gyp. 
Add __init__.py to gyp_gen and explicitly include android_framework_gyp
from there.

Fixes a bug where after moving that file, python was looking for it in
its old location, where there was a compiled version of the file.

BUG=skia:2468
R=epoger@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14427 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-29 00:39:45 +00:00
commit-bot@chromium.org
d665685469 Generate tests/Android.mk from gyp 
gyp/apptype_console.gypi:
Don't include console app dependencies when building for Android framework.

gyp/tests.gyp:
Add/remove libraries for framework build.

platform_tools/android/bin/android_framework_gyp.py:
Moved to gyp_gen.
clean_up_gypd_files moved to this script.

platform_tools/android/bin/gyp_to_android.py:
Call new function for generating tool makefile.
Set LOCAL_MODULE.

platform_tools/android/gyp_gen/gypd_parser.py:
Support relative paths.

platform_tools/android/gyp_gen/makefile_writer.py:
Factor out helper functions to be used by tool writer.
LOCAL_MODULE is set elsewhere.

platform_tools/android/gyp_gen/tool_makefile_writer.py:
Multipurpose file for writing makefiles for tools. Should be able to use
it mostly unchanged for bench, gm, etc.

platform_tools/android/gyp_gen/vars_dict_lib.py:
Make the comments follow the style guide.
Add set().
Rename __li to __ordered_set

More/update tests:
platform_tools/android/tests/android_framework_gyp_tests.py
platform_tools/android/tests/expectations/Android.mk
platform_tools/android/tests/expectations/tool/Android.mk
platform_tools/android/tests/expectations/write_local_vars_append_arm
platform_tools/android/tests/expectations/write_local_vars_append_foo
platform_tools/android/tests/expectations/write_local_vars_append_no_name
platform_tools/android/tests/expectations/write_local_vars_no_append_arm
platform_tools/android/tests/expectations/write_local_vars_no_append_foo
platform_tools/android/tests/expectations/write_local_vars_no_append_no_name
platform_tools/android/tests/gyp_to_android_tests.py
platform_tools/android/tests/makefile_writer_tests.py
platform_tools/android/tests/ordered_set_tests.py
platform_tools/android/tests/test_variables.py

BUG=skia:2447

May require an update to the bot to remove pyc files.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14408 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-28 16:00:30 +00:00
commit-bot@chromium.org
44566e2a15 Fix android_gdbserver script to work with changes from a137675. 
Also stop assuming ANDROID_ARCH one of x86 or arm.

NOTRY=true
R=mtklein@google.com, djsollen@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14358 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-24 18:36:36 +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
ec68ee9d56 Allow running gyp_to_android without SkUserConfig. 
The old code requires that include/config/SkUserConfig.h exists,
to ensure that it gets copied into Android's
include/core/SkUserConfig.h when we do a merge. However, if a
developer wants to make changes and rerun the script, they
should not have to recreate include/config/SkUserConfig.h just
to rerun the script. By default, allow the original to not
exist and just skip the copy.

Update tests to pass. Also add tests to support this use case.

Make gyp_to_android.py executable.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14273 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-21 14:45:01 +00:00
commit-bot@chromium.org
d202528f48 SkiaSampleRenderer - handle case where compiler won't cast jint to void*. 
R=djsollen@google.com, scroggo@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14244 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-17 19:41:06 +00:00
skia.committer@gmail.com
d1061e254a Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14215 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-16 03:04:01 +00:00
commit-bot@chromium.org
ec1ff6aa5e Fix generation of Android SampleApp APK now that we default to using gyp's ninja generator. 
R=scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14212 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-15 21:37:12 +00:00
commit-bot@chromium.org
fe23f7978f Revert of remove sprintf (https://codereview.chromium.org/230413005/) 
Reason for revert:
Boo, hiss, SK_ARRAY_COUNT not defined in skia_launcher.cpp!

Original issue's description:
> remove sprintf
>
> Committed: http://code.google.com/p/skia/source/detail?r=14123

R=halcanary@google.com
TBR=halcanary@google.com
NOTREECHECKS=true
NOTRY=true

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14125 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 23:38:57 +00:00
commit-bot@chromium.org
d6e9b88468 remove sprintf 
R=mtklein@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14123 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 23:22:44 +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
479d1ae9b6 Fixes to Android.mk generation for arm64. 
Remove warning about no optimizations for arm64 and rebaseline the
associated test.

Exclude _opts_none.cpps when building arm64, to avoid double definitions.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 13:34:26 +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
c13fae6d49 android_make now exactly the same as android_ninja 
BUG=skia:2382
NOTREECHECKS=True
NOTRY=True
R=djsollen@google.com, mtklein@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14045 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-03 15:08:49 +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
23f116daa3 Rename test SkUserConfig files. 
Since we never want to build with the fake SkUserConfig.h files
(they're only there for testing), change their name to
SkUserConfig-h.txt. Now the housekeeper will ignore it.

Also, update the generated version to match what the housekeeper
wanted. It wants my tabs to be 4 spaces, so change my tabs to 4
spaces!

NOTRY=true

Fixes buildbots.

BUG=skia:2365
R=epoger@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14013 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-01 19:03:00 +00:00
skia.committer@gmail.com
da0d978b1f Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13989 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-29 03:02:36 +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
ba0c5ea90d Updates to Android.mk generation. 
Generate SkUserConfig.
Include arm64 as another build flavor.
Add tests.

gyp/common_conditions.gypi:
Add conditions for Android framework. These will get written into the generated SkUserConfig.

include/core/SkUserConfig.h:
Generated version that will ultimately be checked into Android (but not here).

platform_tools/android/bin/gyp_to_android.py:
Generate SkUserConfig.
Add arm64 (note that arm64 is not currently respected by our gyp files, so it results in use _none.cpp for the various opts).
Reset the common defines, which are now passed to the generated SkUserConfig.

platform_tools/android/gyp_gen/generate_user_config.py:
New script to generate SkUserConfig.h.

platform_tools/android/gyp_gen/gypd_parser.py:
Fix a lint error (unused import).

platform_tools/android/gyp_gen/makefile_writer.py:
Append any remaining DEFINES to LOCAL_CFLAGS (previously this was done during parsing).
Add a warning for arm64 (corresponds to downstream Android.mk).

platform_tools/android/gyp_gen/vars_dict_lib.py:
Add OrderedSet.reset().
Add DEFINES to VarsDict.

platform_tools/android/tests/expectations/:
Add and update expectations files.

platform_tools/android/tests/generate_user_config_tests.py:
New test for generate_user_config.py

platform_tools/android/tests/inputs/SkUserConfig.h:
Input to the new test, so we don't have to update the expectations each time the real SkUserConfig.h changes.

platform_tools/android/tests/makefile_writer_tests.py:
Add a way to rebaseline test_write_local_vars, which has changed.
Refactor EXPECTATIONS_DIR and compare_files into a separate file for sharing with generate_user_config_tests.py.

platform_tools/android/tests/utils.py:
Common code for tests.

platform_tools/android/tests/var_dict_tests.py:
Use a for loop to test the new key (DEFINES) and future proof this test to test any new keys in the future.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13975 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-28 15:59:04 +00:00
commit-bot@chromium.org
f6394d91e5 Add tests for makefile_writer.py. 
Many of the tests performed are comparison tests, where we call the
functions using dummy values and then compare to expectations (also
newly added).

Add a way to rebaseline the test for write_android_mk, which is likely
to change in the future.

BUG=skia:1975
R=epoger@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13957 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-26 19:46:51 +00:00
commit-bot@chromium.org
2ac68c6892 Add tools to generated Android.mk 
Include the skia tools (bench, gm, tests) in the generated Android
make file for the framework. They are commented out, so that a tester
can include them if desired.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13915 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-24 18:26:36 +00:00
commit-bot@chromium.org
662af29307 android_run_skia: fix error check 
(SkipBuildbotRuns)
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13881 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 19:48:16 +00:00
commit-bot@chromium.org
e32eeec7bf add some debugging for bug skia:2313 
(SkipBuildbotRuns)
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13877 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 17:32:27 +00:00
commit-bot@chromium.org
069c2a46ba Updates to the Android.mk writer. 
Keeping up with changes made to the Android.mk file that is
currently checked in.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13626 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-28 17:24:32 +00:00
commit-bot@chromium.org
64ca10287a Use chromium's gyp if third_party is not available. 
This is for building Android.mk inside an Android tree where there
is no third_party directory.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13614 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-27 18:58:51 +00:00
commit-bot@chromium.org
e734c15aeb fix debugging script for the SampleApp 
R=scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13444 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-13 22:31:48 +00:00
commit-bot@chromium.org
8933563174 Scripts to generate Android.mk for framework Skia. 
In order to create Android.mk, run

>> python platform_tools/android/bin/gyp_to_android.py

For the change in the Android.mk file, see
https://googleplex-android-review.git.corp.google.com/#/c/408170/

(SkipBuildbotRuns)

BUG=skia:1975
R=djsollen@google.com, epoger@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13344 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-06 16:13:00 +00:00
commit-bot@chromium.org
495157b991 Fix SampleApp for devices who don't support the full OpenGL API 
R=bsalomon@google.com, ernstm@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13322 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 16:39:41 +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
32678d9a45 use some helper Make functions to initialize SkImageInfo 
BUG=
R=halcanary@google.com, scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13081 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-15 02:38:22 +00:00
borenet@google.com
6f0f5b4aad Remove references to Skia's SVN repository 
BUG=
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13006 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-09 21:41:39 +00:00
commit-bot@chromium.org
a3b84d41ef Support MSAA4 and (non-ES) OpenGL in Android SampleApp 
Add a menu item to set the OpenGL context type that SampleApp uses on
Android. The submenu of the new item will present options to create
OpenGL ES or OpenGL, aliased or multisampled.

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

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12610 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-10 20:37:41 +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
djsollen@google.com
0e9297c7bd update android build to use SDK API level 19. 
BUG=1817

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12504 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-05 13:57:54 +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
mtklein@google.com
f1077f9164 Add extra warnings to match what Android uses. 
R=mtklein@google.com

Committed: https://code.google.com/p/skia/source/detail?r=12310

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12314 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-20 15:13:49 +00:00
scroggo@google.com
b60cdc8f4c Revert "Add extra warnings to match what Android uses." 
This reverts commit d234662df1ffeb1bf45b2ade16c4acfb94f89450.

This change broke the build. Will resubmit after fixing warnings.

git-svn-id: http://skia.googlecode.com/svn/trunk@12311 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-20 13:58:58 +00:00
djsollen@google.com
692f88c7f0 Add extra warnings to match what Android uses. 
R=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12310 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-20 13:16:47 +00:00
commit-bot@chromium.org
7507276d86 Fix installing the release build sample app apk 
The android_setup.sh parses command line arguments and stores the ones
it does not use to APP_ARGS variable.

R=djsollen@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12153 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-11-06 15:01:37 +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