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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: Make comments better 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Android.mk
diff --git a/Android.mk b/Android.mk
index 5e94479f69d14e004f699e3ef4a208590559db13..6cf1fd55e33ff37b18e0b92568550295dfd1b5c2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,8 +8,11 @@
# 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
-CHROMIUM_WEBVIEW_DIR := $(call my-dir)
-include $(CHROMIUM_WEBVIEW_DIR)/GypAndroid.mk
-include $(CHROMIUM_WEBVIEW_DIR)/android_webview/Android.mk
+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
+include $(CHROMIUM_DIR)/android_webview/Android.mk
endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698