diff options
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/android_setup.sh | 6 | ||||
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 9 | ||||
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh index eaa6ac531a..3c6d44d84f 100755 --- a/platform_tools/android/bin/android_setup.sh +++ b/platform_tools/android/bin/android_setup.sh @@ -116,16 +116,16 @@ setup_device() { ANDROID_ARCH="arm" ;; intel_rhb | razr_i) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=x86" DEFINES="${DEFINES} skia_resource_cache_mb_limit=32" ANDROID_ARCH="x86" ;; x86) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32" + DEFINES="${DEFINES} skia_arch_type=x86" ANDROID_ARCH="x86" ;; x86_64 | x64) - DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64" + DEFINES="${DEFINES} skia_arch_type=x86_64" ANDROID_ARCH="x86_64" ;; arm_v7) diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index e700f2fd84..9ce330c422 100755 --- a/platform_tools/android/bin/gyp_to_android.py +++ b/platform_tools/android/bin/gyp_to_android.py @@ -107,6 +107,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): True, gyp_source_dir) x86_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86', False, gyp_source_dir) + x86_64_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'x86_64', + False, gyp_source_dir) mips_var_dict = generate_var_dict(tmp_folder, main_gyp_file, 'mips', False, gyp_source_dir) @@ -121,8 +123,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): # should be part of the makefile always. Each dict will now contain trimmed # lists containing only variable definitions specific to that configuration. var_dict_list = [default_var_dict, arm_var_dict, arm_neon_var_dict, - x86_var_dict, mips_var_dict, mips64_var_dict, - arm64_var_dict] + x86_var_dict, x86_64_var_dict, mips_var_dict, + mips64_var_dict, arm64_var_dict] common = vars_dict_lib.intersect(var_dict_list) common.LOCAL_MODULE.add('libskia') @@ -178,8 +180,7 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): arm_neon_var_dict, 'arm', 'ARCH_ARM_HAVE_NEON')) deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict, 'x86')) - # Currently, x86_64 is identical to x86 - deviations_from_common.append(makefile_writer.VarsDictData(x86_var_dict, + deviations_from_common.append(makefile_writer.VarsDictData(x86_64_var_dict, 'x86_64')) deviations_from_common.append(makefile_writer.VarsDictData(mips_var_dict, diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 210a61a13f..ace21ccae7 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -1,3 +1,4 @@ +# { 'targets': [ { @@ -18,10 +19,10 @@ [ 'skia_arch_type == "arm64"', { 'android_arch%': "arm64-v8a", }], - [ 'skia_arch_type == "x86" and skia_arch_width == 32', { + [ 'skia_arch_type == "x86"', { 'android_arch%': "x86", }], - [ 'skia_arch_type == "x86" and skia_arch_width == 64', { + [ 'skia_arch_type == "x86_64"', { 'android_arch%': "x86_64", }], [ 'skia_arch_type == "mips" and skia_arch_width == 32', { |