diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 17:15:17 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:31 +0100 |
| commit | 9628e2bda7f58eb73bddf403fddc498c1b97ccac (patch) | |
| tree | bdeff9080d61634a1f4e0ff67680d635f295ae20 /Android.mk | |
| parent | e7bbc0900fd93114f04d2690ce8eab67b784b8c8 (diff) | |
| download | external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.zip external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.tar.gz external_webkit-9628e2bda7f58eb73bddf403fddc498c1b97ccac.tar.bz2 | |
Merge WebKit at r74534: Fix Makefiles
Change-Id: Ife4c035f871dd827884645255ce788fbdb49f84e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |