diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
| commit | 4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch) | |
| tree | b98c2a945dbec61aeb9edef5e371f905e7ab5b37 /GypAndroid.linux-arm.mk | |
| parent | e92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff) | |
| download | chromium_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.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index b79df8980b..c83a2704b1 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -4,7 +4,6 @@ LOCAL_PATH := $(call my-dir) GYP_CONFIGURATION ?= Debug -include $(LOCAL_PATH)/android_webview/All.target.linux-arm.mk include $(LOCAL_PATH)/android_webview/android_webview_common.target.linux-arm.mk include $(LOCAL_PATH)/android_webview/android_webview_pak.target.linux-arm.mk include $(LOCAL_PATH)/android_webview/libwebviewchromium.target.linux-arm.mk |