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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Android.mk

Issue 11090069: Android: Make webview builds more convenient. (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | android_webview/tools/gyp_webview » ('j') | android_webview/tools/gyp_webview » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Android.mk
diff --git a/Android.mk b/Android.mk
index d8600fb6af9dc6849d0c9442e04588289ad3a7d1..2f7c924f6b0c13a199c53333793c1ba21662d90f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,5 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# This is an empty Android makefile to prevent the Android build system from
-# erroneously picking up other Android.mk files in the Chromium tree.
+# This Android makefile is used to build WebView in the Android build system.
+# gyp autogenerates the real makefiles, which we just include here if we are
+# doing a WebView build. For other builds, this makefile does nothing, which
+# prevents the Android build system from mistakenly loading any other
+# Android.mk that may exist in the Chromium tree.
+
+ifdef CHROME_ANDROID_BUILD_WEBVIEW
+include $(call my-dir)/GypAndroid.mk
+endif
« no previous file with comments | « no previous file | android_webview/tools/gyp_webview » ('j') | android_webview/tools/gyp_webview » ('J')

Powered by Google App Engine
This is Rietveld 408576698