diff options
| author | Feng Qian <fqian@google.com> | 2009-04-21 14:39:59 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-04-21 14:39:59 -0700 |
| commit | c1d9ea761026318d54ee5b6e086021bdaceb4ddc (patch) | |
| tree | 63037ac78cb060a57b66187e50eaeb052eba4312 /JavaScriptCore | |
| parent | ba8f92f666d8cdf3f6bdbe4b53d214fade995b74 (diff) | |
| download | external_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.zip external_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.tar.gz external_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.tar.bz2 | |
Move WTF files into Android.wtf.mk
This file can be shared by both JavaScriptCore and V8 builds.
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 38 | ||||
| -rw-r--r-- | JavaScriptCore/Android.wtf.mk | 41 |
2 files changed, 42 insertions, 37 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index fbad0f6..4e0df78 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -72,12 +72,6 @@ LOCAL_SRC_FILES := \ parser/Nodes.cpp \ parser/Parser.cpp \ \ - pcre/pcre_compile.cpp \ - pcre/pcre_exec.cpp \ - pcre/pcre_tables.cpp \ - pcre/pcre_ucp_searchfuncs.cpp \ - pcre/pcre_xclass.cpp \ - \ profiler/HeavyProfile.cpp \ profiler/Profile.cpp \ profiler/ProfileGenerator.cpp \ @@ -166,27 +160,6 @@ LOCAL_SRC_FILES := \ wrec/WRECGenerator.cpp \ wrec/WRECParser.cpp \ \ - wtf/Assertions.cpp \ - wtf/ByteArray.cpp \ - wtf/CurrentTime.cpp \ - wtf/FastMalloc.cpp \ - wtf/HashTable.cpp \ - wtf/MainThread.cpp \ - wtf/RandomNumber.cpp \ - wtf/RefCountedLeakCounter.cpp \ - wtf/TCSystemAlloc.cpp \ - wtf/Threading.cpp \ - wtf/ThreadingPthreads.cpp \ - \ - wtf/android/MainThreadAndroid.cpp \ - \ - wtf/TypeTraits.cpp \ - wtf/dtoa.cpp \ - \ - wtf/unicode/CollatorDefault.cpp \ - wtf/unicode/UTF8.cpp \ - \ - wtf/unicode/icu/CollatorICU.cpp # Rule to build grammar.y with our custom bison. GEN := $(intermediates)/parser/Grammar.cpp @@ -220,13 +193,4 @@ $(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table $(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table $(transform-generated-source) -CHARTABLES := $(intermediates)/chartables.c -$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) -$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@ -$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables -$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h - $(transform-generated-source) - -$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) - -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) +LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) diff --git a/JavaScriptCore/Android.wtf.mk b/JavaScriptCore/Android.wtf.mk new file mode 100644 index 0000000..a142435 --- /dev/null +++ b/JavaScriptCore/Android.wtf.mk @@ -0,0 +1,41 @@ +# wtf source files + +LOCAL_SRC_FILES := \ + pcre/pcre_compile.cpp \ + pcre/pcre_exec.cpp \ + pcre/pcre_tables.cpp \ + pcre/pcre_ucp_searchfuncs.cpp \ + pcre/pcre_xclass.cpp \ + \ + wtf/Assertions.cpp \ + wtf/ByteArray.cpp \ + wtf/CurrentTime.cpp \ + wtf/FastMalloc.cpp \ + wtf/HashTable.cpp \ + wtf/MainThread.cpp \ + wtf/RandomNumber.cpp \ + wtf/RefCountedLeakCounter.cpp \ + wtf/TCSystemAlloc.cpp \ + wtf/Threading.cpp \ + wtf/ThreadingPthreads.cpp \ + \ + wtf/android/MainThreadAndroid.cpp \ + \ + wtf/TypeTraits.cpp \ + wtf/dtoa.cpp \ + \ + wtf/unicode/CollatorDefault.cpp \ + wtf/unicode/UTF8.cpp \ + \ + wtf/unicode/icu/CollatorICU.cpp + +CHARTABLES := $(intermediates)/chartables.c +$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) +$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@ +$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables +$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h + $(transform-generated-source) + +$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) + +LOCAL_GENERATED_SOURCES += $(CHARTABLES) |