From 9628e2bda7f58eb73bddf403fddc498c1b97ccac Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 5 May 2011 17:15:17 +0100 Subject: Merge WebKit at r74534: Fix Makefiles Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 51640aa..bc68c00 100644 --- a/Android.mk +++ b/Android.mk @@ -142,6 +142,7 @@ LOCAL_C_INCLUDES := \ external/ \ external/icu4c/common \ external/icu4c/i18n \ + external/jpeg \ external/libxml2/include \ external/libxslt \ external/hyphenation \ @@ -170,6 +171,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/html \ $(LOCAL_PATH)/WebCore/html/canvas \ $(LOCAL_PATH)/WebCore/html/parser \ + $(LOCAL_PATH)/WebCore/html/shadow \ $(LOCAL_PATH)/WebCore/inspector \ $(LOCAL_PATH)/WebCore/loader \ $(LOCAL_PATH)/WebCore/loader/appcache \ @@ -492,4 +494,4 @@ include $(BASE_PATH)/WebKit/android/wds/client/Android.mk include $(BASE_PATH)/WebKit/android/benchmark/Android.mk # Build the webkit merge tool. -include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk +include $(BASE_PATH)/Tools/android/webkitmerge/Android.mk -- cgit v1.1