Android.mk - Issue 11416036: Android WebView: allow for multiple target architectures.

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: Android.mk

Issue 11416036: Android WebView: allow for multiple target architectures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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: Android.mk

diff --git a/Android.mk b/Android.mk

index 6cf1fd55e33ff37b18e0b92568550295dfd1b5c2..1e5390e8a51da9d9745dcf7d9eb68a9bc6cc6801 100644

--- a/Android.mk

+++ b/Android.mk

@@ -12,7 +12,7 @@ CHROMIUM_DIR := $(call my-dir)

# Assume that if the gyp autogenerated makefile exists, we are doing the

# WebView build using the Android build system.

-ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.mk))

-include $(CHROMIUM_DIR)/GypAndroid.mk

+ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(TARGET_ARCH).mk))

+include $(CHROMIUM_DIR)/GypAndroid.$(TARGET_ARCH).mk

include $(CHROMIUM_DIR)/android_webview/Android.mk

endif