diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 08:59:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-05 08:59:28 -0700 |
| commit | 821cfee07d114f74b98673d380d90c08d001df02 (patch) | |
| tree | a27d34768a5943edd29a21d893003aa1a4d1bf49 /WebCore/Android.derived.mk | |
| parent | 24c6a233780d45269caa0095213e59a3ded360b6 (diff) | |
| parent | 13cb86d508a2af29cda7a8336a3375ccddab1bd0 (diff) | |
| download | external_webkit-821cfee07d114f74b98673d380d90c08d001df02.zip external_webkit-821cfee07d114f74b98673d380d90c08d001df02.tar.gz external_webkit-821cfee07d114f74b98673d380d90c08d001df02.tar.bz2 | |
Merge changes I27224716,I6102bbce
* changes:
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
Generate files correctly
Diffstat (limited to 'WebCore/Android.derived.mk')
| -rw-r--r-- | WebCore/Android.derived.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index e2cf096..7c2e8e4 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -59,12 +59,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) GEN := $(intermediates)/html/DocTypeStrings.cpp $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $< +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $< $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf $(transform-generated-source) - @mv ./DocTypeStrings.cpp $@ -# we have to do this dep by hand: -$(intermediates)/html/HTMLDocument.o : $(GEN) +LOCAL_GENERATED_SOURCES += $(GEN) # HTML entity table @@ -86,10 +84,9 @@ LOCAL_GENERATED_SOURCES += $(GEN) GEN := $(intermediates)/platform/ColorData.cpp $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $< +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $< $(GEN): $(LOCAL_PATH)/platform/ColorData.gperf $(transform-generated-source) - @mv ./ColorData.cpp $@ LOCAL_GENERATED_SOURCES += $(GEN) |