diff options
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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 |