diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-08 17:48:05 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:42 -0800 |
| commit | 454b60990e7456af58a206f820de646101747595 (patch) | |
| tree | f4f37e4d2d8760ff1d29b15a73cf2b44695a0859 /JavaScriptCore | |
| parent | 0416fc3b3da8e36f371c6a9b2b47d0dc68b4bd72 (diff) | |
| download | external_webkit-454b60990e7456af58a206f820de646101747595.zip external_webkit-454b60990e7456af58a206f820de646101747595.tar.gz external_webkit-454b60990e7456af58a206f820de646101747595.tar.bz2 | |
Merge Webkit at r73109: Fix Makefiles.
Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 6ae8c84..b4fe1f6 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -172,6 +172,7 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ + wtf/OSAllocatorPosix.cpp \ wtf/PageAllocation.cpp \ wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ @@ -237,4 +238,10 @@ $(CHARTABLES): $(LOCAL_PATH)/pcre/dftables $(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) +REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h +$(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH) +$(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@ +$(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables + $(transform-generated-source) + +LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) $(REGEXP_JIT_TABLES) |