Update makefiles after merge of Chromium at 241283
This commit was generated by merge_from_chromium.py.
Change-Id: If0f8fab3b81b7e06e95d63490d3a9a61632f4517
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 1e1a71b..6c5ce21 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -121,7 +121,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -207,7 +206,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 9f8e0b5..bcbe558 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -120,7 +120,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -205,7 +204,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index fb6b2fa..0344288 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -123,7 +123,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -212,7 +211,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 1e1a71b..6c5ce21 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -121,7 +121,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -207,7 +206,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 9f8e0b5..bcbe558 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -120,7 +120,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -205,7 +204,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index fb6b2fa..0344288 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -123,7 +123,6 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -212,7 +211,6 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
- $(LOCAL_PATH)/third_party/lzma_sdk \
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \