diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 12:34:17 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 12:34:17 +0000 |
| commit | e906dbe3003d2e057af6ff896bbdec9f9118ad75 (patch) | |
| tree | 44f9c43fd07cc85de5153a3fab07f72a392b4857 /Android.mk | |
| parent | 1f0d041d875f287e1da906c39db249f713433ef2 (diff) | |
| download | chromium_src-e906dbe3003d2e057af6ff896bbdec9f9118ad75.zip chromium_src-e906dbe3003d2e057af6ff896bbdec9f9118ad75.tar.gz chromium_src-e906dbe3003d2e057af6ff896bbdec9f9118ad75.tar.bz2 | |
Android WebView: makefiles are host_os-specific.
The generated makefiles are specific to the host OS they were generated
for. For now, just name them appropriately so that mac hosts don't try
to include linux-specific makefiles.
BUG=
Review URL: https://codereview.chromium.org/11416127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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.$(TARGET_ARCH).mk)) -include $(CHROMIUM_DIR)/GypAndroid.$(TARGET_ARCH).mk +ifneq (,$(wildcard $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk)) +include $(CHROMIUM_DIR)/GypAndroid.$(HOST_OS)-$(TARGET_ARCH).mk include $(CHROMIUM_DIR)/android_webview/Android.mk endif |