chromium/src
0
Fork 0
Code Activity

Android WebView: makefiles are host_os-specific.

Browse Source 
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
This commit is contained in:
torne@chromium.org
2012-11-21 12:34:17 +00:00
parent 1f0d041d87
commit e906dbe300
2 changed files with 3 additions and 3 deletions
Android.mk
android_webview/tools
gyp_webview

4
Android.mk

@ -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

2
android_webview/tools/gyp_webview

@ -14,4 +14,4 @@ export CHROME_ANDROID_BUILD_WEBVIEW=1
export CHROME_SRC="$(readlink -f "$(dirname "$0")/../..")"
export PYTHONDONTWRITEBYTECODE=1
. build/android/envsetup.sh --target-arch=arm
android_gyp --suffix .arm
android_gyp --suffix .linux-arm