Android.mk - Issue 11269007: Android: make the top level Android makefile smarter.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Android.mk

Issue 11269007: Android: make the top level Android makefile smarter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 # This Android makefile is used to build WebView in the Android build system.	5 # This Android makefile is used to build WebView in the Android build system.

6 # gyp autogenerates most of the real makefiles, which we just include here if	6 # gyp autogenerates most of the real makefiles, which we just include here if

7 # we are doing a WebView build. For other builds, this makefile does nothing,	7 # we are doing a WebView build. For other builds, this makefile does nothing,

8 # which prevents the Android build system from mistakenly loading any other	8 # which prevents the Android build system from mistakenly loading any other

9 # Android.mk that may exist in the Chromium tree.	9 # Android.mk that may exist in the Chromium tree.

10	10

11 ifdef CHROME_ANDROID_BUILD_WEBVIEW	11 CHROMIUM_DIR := $(call my-dir)

12 CHROMIUM_WEBVIEW_DIR := $(call my-dir)	12

13 include $(CHROMIUM_WEBVIEW_DIR)/GypAndroid.mk	13 # Assume that if the gyp autogenerated makefile exists, we are doing the

14 include $(CHROMIUM_WEBVIEW_DIR)/android_webview/Android.mk	14 # WebView build.
	joth 2012/10/24 20:09:58 nit: the WebView build is a bit ambiguous. (we sho nit: the WebView build is a bit ambiguous. (we should standardize terminology) "we are doing an in android tree build" or "as part of the android system build" ? Torne 2012/10/25 11:12:02 Changed this to "we are doing the WebView build us Show quoted text On 2012/10/24 20:09:58, joth wrote: > nit: the WebView build is a bit ambiguous. (we should standardize terminology) > > "we are doing an in android tree build" or "as part of the android system > build" ? Changed this to "we are doing the WebView build using the Android build system."
	15 ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.mk))

	16 include $(CHROMIUM_DIR)/GypAndroid.mk

	17 include $(CHROMIUM_DIR)/android_webview/Android.mk

15 endif	18 endif

OLD	NEW

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