commit f3622fb6a0f976f324f904e8694d291d6a149d63
author Android Chromium Automerger <chromium-automerger@android> Tue May 28 11:16:39 2013 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue May 28 11:16:39 2013 +0000
tree b67f5a46050ce3a6fbcbb8a798b6d8b12d4ad507
parent 5bf41e763645232d7d83ce7b8b8236fee7f3c814

Update makefiles after merge of Chromium at r202530

This commit was generated by merge_from_chromium.py.

Change-Id: I79fbfa2c6cfae56bac040dbae90c5affeb59c875

ots.target.linux-arm.mk

diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index aea3d74..291d5d2 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -118,9 +118,9 @@
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/third_party/ots/include \
 	$(LOCAL_PATH)/third_party/zlib \
-	$(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \
-	$(GYP_ABS_ANDROID_TOP_DIR)/bionic \
-	$(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport
+	$(PWD)/frameworks/wilhelm/include \
+	$(PWD)/bionic \
+	$(PWD)/external/stlport/stlport
 
 LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES)