diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:49:51 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | 7ca64be9978f9d37eb50cfda93839328ab4d0440 (patch) | |
tree | aa8098e2b10e424d1f5c949d6000bc618cd147c9 /Android.mk | |
parent | a94275402997c11dd2e778633dacf4b7e630a35d (diff) | |
download | external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.zip external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.tar.gz external_webkit-7ca64be9978f9d37eb50cfda93839328ab4d0440.tar.bz2 |
Merge Webkit at r70209: Fix Makefiles.
Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -186,6 +186,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/platform/image-decoders/ico \ $(LOCAL_PATH)/WebCore/platform/image-decoders/jpeg \ $(LOCAL_PATH)/WebCore/platform/image-decoders/png \ + $(LOCAL_PATH)/WebCore/platform/image-decoders/webp \ $(LOCAL_PATH)/WebCore/platform/mock \ $(LOCAL_PATH)/WebCore/platform/network \ $(LOCAL_PATH)/WebCore/platform/network/android \ @@ -202,6 +203,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore/svg/animation \ $(LOCAL_PATH)/WebCore/svg/graphics \ $(LOCAL_PATH)/WebCore/svg/graphics/filters \ + $(LOCAL_PATH)/WebCore/svg/properties \ $(LOCAL_PATH)/WebCore/websockets \ $(LOCAL_PATH)/WebCore/workers \ $(LOCAL_PATH)/WebCore/xml |