Merge from Chromium at DEPS revision r215849
This commit was generated by merge_to_master.py.
Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 92dc5fb..3b7b4cb 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -44,19 +44,15 @@
include $(LOCAL_PATH)/content/browser/devtools/devtools_resources.target.linux-x86.mk
include $(LOCAL_PATH)/content/browser/speech/proto/speech_proto.target.linux-x86.mk
include $(LOCAL_PATH)/content/common_aidl.target.linux-x86.mk
-include $(LOCAL_PATH)/content/content.target.linux-x86.mk
-include $(LOCAL_PATH)/content/content_app.target.linux-x86.mk
+include $(LOCAL_PATH)/content/content_app_both.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_browser.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_child.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_common.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_gpu.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_jni_headers.target.linux-x86.mk
-include $(LOCAL_PATH)/content/content_plugin.target.linux-x86.mk
-include $(LOCAL_PATH)/content/content_ppapi_plugin.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_renderer.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_resources.target.linux-x86.mk
include $(LOCAL_PATH)/content/content_utility.target.linux-x86.mk
-include $(LOCAL_PATH)/content/content_worker.target.linux-x86.mk
include $(LOCAL_PATH)/content/java_set_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/content/page_transition_types_java.target.linux-x86.mk
include $(LOCAL_PATH)/content/result_codes_java.target.linux-x86.mk