Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Unified Diff: platform_tools/android/gyp_gen/android_framework_gyp.py

Issue 1054993002: Streamline Thumb config. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: rebase Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « platform_tools/android/bin/android_setup.sh ('k') | platform_tools/chromeos/bin/chromeos_setup.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/gyp_gen/android_framework_gyp.py
diff --git a/platform_tools/android/gyp_gen/android_framework_gyp.py b/platform_tools/android/gyp_gen/android_framework_gyp.py
index 787a4d91a8cceaf1b7705ab62d3ce898614c7444..34a9eeec4796068e90cc2e6835324f86b0a80482 100644
--- a/platform_tools/android/gyp_gen/android_framework_gyp.py
+++ b/platform_tools/android/gyp_gen/android_framework_gyp.py
@@ -63,8 +63,8 @@ def main(target_dir, target_file, skia_arch_type, have_neon,
gyp_defines = ('skia_android_framework=1 OS=android skia_arch_type=%s '
% skia_arch_type)
if skia_arch_type == 'arm':
- # Always use thumb and version 7 for arm
- gyp_defines += 'arm_thumb=1 arm_version=7 '
+ # Always version 7 (which implies thumb) for arm
+ gyp_defines += 'arm_version=7 '
if have_neon:
gyp_defines += 'arm_neon=1 '
else:
« no previous file with comments | « platform_tools/android/bin/android_setup.sh ('k') | platform_tools/chromeos/bin/chromeos_setup.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698