diff options
| author | Jack Palevich <jackpal@google.com> | 2009-05-04 18:13:16 -0700 |
|---|---|---|
| committer | Jack Palevich <jackpal@google.com> | 2009-05-04 18:13:16 -0700 |
| commit | b5b022e2729875123279ed98370b03cd28080ebd (patch) | |
| tree | 3a7b260a885474abb63c6571c4fdebafdb292f57 /JavaScriptCore | |
| parent | 80c54961fb9fac04a32a62b92d078d3013997477 (diff) | |
| download | external_webkit-b5b022e2729875123279ed98370b03cd28080ebd.zip external_webkit-b5b022e2729875123279ed98370b03cd28080ebd.tar.gz external_webkit-b5b022e2729875123279ed98370b03cd28080ebd.tar.bz2 | |
Fix double-definition of jsc_pcre_default_tables.
The generated file chartables.c was being both explicitly #included inside
of pcre_tables.cpp and also added to LOCAL_GENERATED_SOURCES. This lead to
a duplicate symbol definition.
The reason this ever worked was that the Android build system
accidentally ignored ".c" files in LOCAL_GENERATED_SOURCES. Now that the
.c files are being compiled the problem is exposed.
Fixed by simply not adding chartables.c to LOCAL_GENERATED_SOURCES.
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.wtf.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/JavaScriptCore/Android.wtf.mk b/JavaScriptCore/Android.wtf.mk index a142435..3a6ea6e 100644 --- a/JavaScriptCore/Android.wtf.mk +++ b/JavaScriptCore/Android.wtf.mk @@ -38,4 +38,5 @@ $(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h $(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) -LOCAL_GENERATED_SOURCES += $(CHARTABLES) +# We do not add $(CHARTABLES) to LOCAL_GENERATED_SOURCES because the chartables.c file +# is explicitly #included in pcre_tables.cpp.
\ No newline at end of file |