aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android
Commit message (Collapse)AuthorAge
* enable developers to provide their own android toolchainGravatar commit-bot@chromium.org2014-04-09
| | | | | | | | | | 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
* Fixes to Android.mk generation for arm64.Gravatar commit-bot@chromium.org2014-04-09
| | | | | | | | | | | | | | | | 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
* hack hack hackGravatar commit-bot@chromium.org2014-04-04
| | | | | | | | | | | | | | | | | | 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
* android_make now exactly the same as android_ninjaGravatar commit-bot@chromium.org2014-04-03
| | | | | | | | | | | | | 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
* Fix ninja build for AndroidGravatar commit-bot@chromium.org2014-04-03
| | | | | | | | | | | | | | 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
* Rename test SkUserConfig files.Gravatar commit-bot@chromium.org2014-04-01
| | | | | | | | | | | | | | | | | | | | | | | 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
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-03-29
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@13989 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix the ninja build on mac to use nm/readelf from the Android toolchain ↵Gravatar commit-bot@chromium.org2014-03-28
| | | | | | | | | | | | | 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
* Updates to Android.mk generation.Gravatar commit-bot@chromium.org2014-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Add tests for makefile_writer.py.Gravatar commit-bot@chromium.org2014-03-26
| | | | | | | | | | | | | | | | | | 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
* Add tools to generated Android.mkGravatar commit-bot@chromium.org2014-03-24
| | | | | | | | | | | | | | | 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
* android_run_skia: fix error checkGravatar commit-bot@chromium.org2014-03-20
| | | | | | | | | | | | | | (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
* add some debugging for bug skia:2313Gravatar commit-bot@chromium.org2014-03-20
| | | | | | | | | | | | | | (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
* Updates to the Android.mk writer.Gravatar commit-bot@chromium.org2014-02-28
| | | | | | | | | | | | | 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
* Use chromium's gyp if third_party is not available.Gravatar commit-bot@chromium.org2014-02-27
| | | | | | | | | | | | | 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
* fix debugging script for the SampleAppGravatar commit-bot@chromium.org2014-02-13
| | | | | | | | | | 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
* Scripts to generate Android.mk for framework Skia.Gravatar commit-bot@chromium.org2014-02-06
| | | | | | | | | | | | | | | | | | | | 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
* Fix SampleApp for devices who don't support the full OpenGL APIGravatar commit-bot@chromium.org2014-02-05
| | | | | | | | | | 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
* fix script so that the error is actually printed if ant is not installedGravatar commit-bot@chromium.org2014-02-03
| | | | | | | | | | 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
* use some helper Make functions to initialize SkImageInfoGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | 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
* Remove references to Skia's SVN repositoryGravatar borenet@google.com2014-01-09
| | | | | | | | | 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
* Support MSAA4 and (non-ES) OpenGL in Android SampleAppGravatar commit-bot@chromium.org2013-12-10
| | | | | | | | | | | | | | 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
* Add support for MIPS to android buildGravatar commit-bot@chromium.org2013-12-10
| | | | | | | | | | 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
* update android build to use SDK API level 19.Gravatar djsollen@google.com2013-12-05
| | | | | | | | BUG=1817 Review URL: https://codereview.chromium.org/88223002 git-svn-id: http://skia.googlecode.com/svn/trunk@12504 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reverting r12427Gravatar rmistry@google.com2013-12-02
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2013-12-02
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
* Support linking skia statically on AndroidGravatar commit-bot@chromium.org2013-11-26
| | | | | | | | | | | | | | | | 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
* Add logan to android_setup.shGravatar commit-bot@chromium.org2013-11-25
| | | | | | | | | | 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
* Add extra warnings to match what Android uses.Gravatar mtklein@google.com2013-11-20
| | | | | | | | | | 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
* Revert "Add extra warnings to match what Android uses."Gravatar scroggo@google.com2013-11-20
| | | | | | | | 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
* Add extra warnings to match what Android uses.Gravatar djsollen@google.com2013-11-20
| | | | | | | | 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
* Fix installing the release build sample app apkGravatar commit-bot@chromium.org2013-11-06
| | | | | | | | | | | | | 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
* Make it possible to pass GYP_DEFINES to Android buildsGravatar commit-bot@chromium.org2013-11-05
| | | | | | | | | | | | | | 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
* move SkImage::ColorType into SkColorTypeGravatar reed@google.com2013-11-01
| | | | | | | | | | | | | | | | | | objective -- move clients over to SkImage tasks - use SkImageInfo instead of SkBitmap::Config - add support for colortables to SkImage - add drawImage to SkCanvas - return SkImage from readPixels This CL works towards the first task R=robertphillips@google.com Review URL: https://codereview.chromium.org/54363008 git-svn-id: http://skia.googlecode.com/svn/trunk@12077 2bbb7eff-a529-9590-31e7-b0007b416f81
* Allow specifying the max texture count on the botsGravatar robertphillips@google.com2013-10-30
| | | | | | | | https://codereview.chromium.org/50413011/ git-svn-id: http://skia.googlecode.com/svn/trunk@12020 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix android_gdb_exe scriptGravatar djsollen@google.com2013-10-10
| | | | | | | | R=mtklein@google.com Review URL: https://codereview.chromium.org/26871003 git-svn-id: http://skia.googlecode.com/svn/trunk@11706 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix ninja build on AndroidGravatar djsollen@google.com2013-10-01
| | | | | | | | R=mtklein@google.com Review URL: https://codereview.chromium.org/25535002 git-svn-id: http://skia.googlecode.com/svn/trunk@11555 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix the android build. now both android_ninja _and_ android_make work.Gravatar mtklein@google.com2013-09-30
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/25319003 git-svn-id: http://skia.googlecode.com/svn/trunk@11542 2bbb7eff-a529-9590-31e7-b0007b416f81
* VERBOSE -> SKIA_ANDROID_VERBOSE_SETUPGravatar mtklein@google.com2013-09-30
| | | | | | | | | BUG= R=borenet@google.com Review URL: https://codereview.chromium.org/25269008 git-svn-id: http://skia.googlecode.com/svn/trunk@11541 2bbb7eff-a529-9590-31e7-b0007b416f81
* make vanilla android_ninja work, and add quiet optionsGravatar mtklein@google.com2013-09-30
| | | | | | | | | BUG= R=djsollen@google.com Review URL: https://codereview.chromium.org/25275006 git-svn-id: http://skia.googlecode.com/svn/trunk@11540 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove uneeded copy of gdbserver from apkGravatar djsollen@google.com2013-09-30
| | | | | | | | R=mtklein@google.com Review URL: https://codereview.chromium.org/25336002 git-svn-id: http://skia.googlecode.com/svn/trunk@11539 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix Android release buildsGravatar mtklein@google.com2013-09-30
| | | | | | | | | BUG= R=djsollen@google.com Review URL: https://codereview.chromium.org/25300005 git-svn-id: http://skia.googlecode.com/svn/trunk@11535 2bbb7eff-a529-9590-31e7-b0007b416f81
* remove unecessary warnings from third_party codeGravatar djsollen@google.com2013-09-30
| | | | | | | | R=mtklein@google.com Review URL: https://codereview.chromium.org/25030003 git-svn-id: http://skia.googlecode.com/svn/trunk@11529 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add android_ninja, like android_make for ninja.Gravatar mtklein@google.com2013-09-30
| | | | | | | | | | | | | | | | | | | android_ninja {tests,bench,gm,bench_pictures,render_pictures} all build and run fine. They build so fast I thought maybe they were broken. Note that android_ninja with no argument is failing: ninja: Entering directory `out/config/android-arm_v7_thumb/Debug' ninja: error: 'lib.target/libSampleApp.so', needed by 'android/libs/armeabi-v7a/libSampleApp.so', missing and no known rule to make it Will look into this. BUG= R=djsollen@google.com Committed: https://code.google.com/p/skia/source/detail?r=11525 Review URL: https://codereview.chromium.org/24833002 git-svn-id: http://skia.googlecode.com/svn/trunk@11527 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Add android_ninja, like android_make for ninja."Gravatar mtklein@google.com2013-09-30
| | | | | | | | | | Broke some builds. Will try again. BUG= Review URL: https://codereview.chromium.org/25307002 git-svn-id: http://skia.googlecode.com/svn/trunk@11526 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add android_ninja, like android_make for ninja.Gravatar mtklein@google.com2013-09-30
| | | | | | | | | | | | | | | | | android_ninja {tests,bench,gm,bench_pictures,render_pictures} all build and run fine. They build so fast I thought maybe they were broken. Note that android_ninja with no argument is failing: ninja: Entering directory `out/config/android-arm_v7_thumb/Debug' ninja: error: 'lib.target/libSampleApp.so', needed by 'android/libs/armeabi-v7a/libSampleApp.so', missing and no known rule to make it Will look into this. BUG= R=djsollen@google.com Review URL: https://codereview.chromium.org/24833002 git-svn-id: http://skia.googlecode.com/svn/trunk@11525 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix android_run_skiaGravatar borenet@google.com2013-09-27
| | | | | | | | | | If STATUS_FILENAME doesn't exist, exit 1. R=djsollen@google.com, jvanverth@google.com Review URL: https://codereview.chromium.org/24770002 git-svn-id: http://skia.googlecode.com/svn/trunk@11498 2bbb7eff-a529-9590-31e7-b0007b416f81
* use new globally scoped SkAlphaTypeGravatar reed@google.com2013-09-20
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@11424 2bbb7eff-a529-9590-31e7-b0007b416f81
* various bug fixes.Gravatar djsollen@google.com2013-09-11
| | | | | | | | | | | | | 1. update mac support for md5 2. update default build to be thumb (SkipBuildbotRuns) R=mtklein@google.com Review URL: https://codereview.chromium.org/23514051 git-svn-id: http://skia.googlecode.com/svn/trunk@11201 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix error in android setup scriptGravatar djsollen@google.com2013-09-04
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@11074 2bbb7eff-a529-9590-31e7-b0007b416f81