diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 15:59:04 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 15:59:04 +0000 |
| commit | ba0c5ea90d0e6b2e8b20696e54fea13ead6dda93 (patch) | |
| tree | 0544c2647448b740709280b6159230cc6ce1ff42 /gyp | |
| parent | 3eedb801e35001df4b7e154edf4fd8da942296a0 (diff) | |
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
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index d7bc5ab447..82f63f375b 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -253,9 +253,27 @@ # draw-time, at which point we know which SkTypeface is being drawn 'SK_USE_FREETYPE_EMBOLDEN', # Android provides at least FreeType 2.4.0 at runtime. - 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', + 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400', # Skia should not use dlopen on Android. - 'SK_CAN_USE_DLOPEN=0', + 'SK_CAN_USE_DLOPEN 0', + 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', + # When built as part of the system image we can enable certian non-NDK + # compliant optimizations. + 'SK_BUILD_FOR_ANDROID_FRAMEWORK', + # Android Text Tuning + 'SK_GAMMA_APPLY_TO_A8', + 'SK_GAMMA_EXPONENT 1.4', + 'SK_GAMMA_CONTRAST 0.0', + # Optimizations for chromium (m30) + 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', + 'IGNORE_ROT_AA_RECT_OPT', + # Disable this check because it is too strict for some chromium-specific + # subclasses of SkPixelRef. See bug: crbug.com/171776. + 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', + 'SkLONGLONG int64_t', + 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', + 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"', + 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', ], }], |