diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
| commit | 3240926e260ce088908e02ac07a6cf7b0c0cbf44 (patch) | |
| tree | 5ff5fa16b2fb9278c6d731b3d19123731f3f8626 /GypAndroid.linux-arm.mk | |
| parent | 3b21a50ee4fe6f71bb117cbee9998a4f465eea9d (diff) | |
| download | chromium_org-3240926e260ce088908e02ac07a6cf7b0c0cbf44.tar.gz | |
Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
Diffstat (limited to 'GypAndroid.linux-arm.mk')
| -rw-r--r-- | GypAndroid.linux-arm.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk index 94320676e1..0a2979b63a 100644 --- a/GypAndroid.linux-arm.mk +++ b/GypAndroid.linux-arm.mk @@ -213,6 +213,7 @@ include $(LOCAL_PATH)/ui/surface/surface.target.linux-arm.mk include $(LOCAL_PATH)/ui/ui.target.linux-arm.mk include $(LOCAL_PATH)/ui/ui_jni_headers.target.linux-arm.mk include $(LOCAL_PATH)/ui/ui_resources.target.linux-arm.mk +include $(LOCAL_PATH)/ui/window_open_disposition_java.target.linux-arm.mk include $(LOCAL_PATH)/url/url_lib.target.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/js2c.host.linux-arm.mk include $(LOCAL_PATH)/v8/tools/gyp/mksnapshot.arm.host.linux-arm.mk |