platform_tools/android/gyp_gen/android_framework_gyp.py - Issue 1249003002: Fix Android framework build

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1249003002: Fix Android framework build (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 5 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:

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 34a9eeec4796068e90cc2e6835324f86b0a80482..d2afabd1e8f18c2f09ed10c1c5724d2ede5543e6 100644

--- a/platform_tools/android/gyp_gen/android_framework_gyp.py

+++ b/platform_tools/android/gyp_gen/android_framework_gyp.py

@@ -59,9 +59,12 @@ def main(target_dir, target_file, skia_arch_type, have_neon,

import gyp

+ # Determine the host that we are building from

+ host_os = os.uname()[0].lower()

msarett 2015/07/22 14:27:41 Maybe it doesn't need to be this complicated and h

# Set GYP_DEFINES for building for the android framework.

- gyp_defines = ('skia_android_framework=1 OS=android skia_arch_type=%s '

- % skia_arch_type)

+ gyp_defines = ('skia_android_framework=1 OS=android host_os=%s '

+ 'skia_arch_type=%s ' % (host_os, skia_arch_type))

if skia_arch_type == 'arm':

# Always version 7 (which implies thumb) for arm

gyp_defines += 'arm_version=7 '

« no previous file with comments | « no previous file | no next file » | no next file with comments »