summaryrefslogtreecommitdiff
path: root/GypAndroid.darwin-x86.mk
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-04-01 10:55:12 +0100
committerBen Murdoch <benm@google.com>2014-04-01 10:55:12 +0100
commit4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch)
treeb98c2a945dbec61aeb9edef5e371f905e7ab5b37 /GypAndroid.darwin-x86.mk
parente92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff)
downloadchromium_org-4ad1aa43a48567659193a298fad74f55e00b3dd9.tar.gz
Merge from Chromium at DEPS revision 260540
This commit was generated by merge_to_master.py. Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
Diffstat (limited to 'GypAndroid.darwin-x86.mk')
-rw-r--r--GypAndroid.darwin-x86.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk
index e2e7dc9a50..8b762d8c38 100644
--- a/GypAndroid.darwin-x86.mk
+++ b/GypAndroid.darwin-x86.mk
@@ -4,7 +4,6 @@
LOCAL_PATH := $(call my-dir)
GYP_CONFIGURATION ?= Debug
-include $(LOCAL_PATH)/android_webview/All.target.darwin-x86.mk
include $(LOCAL_PATH)/android_webview/android_webview_common.target.darwin-x86.mk
include $(LOCAL_PATH)/android_webview/android_webview_pak.target.darwin-x86.mk
include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.darwin-x86.mk