diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-06 11:01:04 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-06 11:01:04 +0100 |
| commit | 2385ea399aae016c0806a4f9ef3c9cfe3d2a39df (patch) | |
| tree | e910e76d19265ff3230c473da95410d3f3a007af /GypAndroid.darwin-arm.mk | |
| parent | 8ee924b76946696c0f52e56d28cc5ab741919041 (diff) | |
| download | chromium_org-2385ea399aae016c0806a4f9ef3c9cfe3d2a39df.tar.gz | |
Merge from Chromium at DEPS revision r215849
This commit was generated by merge_to_master.py.
Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
Diffstat (limited to 'GypAndroid.darwin-arm.mk')
| -rw-r--r-- | GypAndroid.darwin-arm.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/GypAndroid.darwin-arm.mk b/GypAndroid.darwin-arm.mk index 9d25ab2a11..cb0cccabb7 100644 --- a/GypAndroid.darwin-arm.mk +++ b/GypAndroid.darwin-arm.mk @@ -44,19 +44,15 @@ include $(LOCAL_PATH)/components/webdata_common.target.darwin-arm.mk include $(LOCAL_PATH)/content/browser/devtools/devtools_resources.target.darwin-arm.mk include $(LOCAL_PATH)/content/browser/speech/proto/speech_proto.target.darwin-arm.mk include $(LOCAL_PATH)/content/common_aidl.target.darwin-arm.mk -include $(LOCAL_PATH)/content/content.target.darwin-arm.mk -include $(LOCAL_PATH)/content/content_app.target.darwin-arm.mk +include $(LOCAL_PATH)/content/content_app_both.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_browser.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_child.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_common.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_gpu.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_jni_headers.target.darwin-arm.mk -include $(LOCAL_PATH)/content/content_plugin.target.darwin-arm.mk -include $(LOCAL_PATH)/content/content_ppapi_plugin.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_renderer.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_resources.target.darwin-arm.mk include $(LOCAL_PATH)/content/content_utility.target.darwin-arm.mk -include $(LOCAL_PATH)/content/content_worker.target.darwin-arm.mk include $(LOCAL_PATH)/content/java_set_jni_headers.target.darwin-arm.mk include $(LOCAL_PATH)/content/page_transition_types_java.target.darwin-arm.mk include $(LOCAL_PATH)/content/result_codes_java.target.darwin-arm.mk |