From 454b60990e7456af58a206f820de646101747595 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Wed, 8 Dec 2010 17:48:05 -0800 Subject: Merge Webkit at r73109: Fix Makefiles. Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55 --- JavaScriptCore/Android.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'JavaScriptCore') 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) -- cgit v1.1