diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-17 19:00:43 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-17 19:05:59 +0100 |
| commit | d5377d392722f82cc1e4d90da7d35d209e2c357c (patch) | |
| tree | c227fd71dda1c3a17ec7a616f8e8520a2b1be369 | |
| parent | ab4f4d6e9dcd2465524619737cd0bbd7386fa14e (diff) | |
| download | external_webkit-d5377d392722f82cc1e4d90da7d35d209e2c357c.zip external_webkit-d5377d392722f82cc1e4d90da7d35d209e2c357c.tar.gz external_webkit-d5377d392722f82cc1e4d90da7d35d209e2c357c.tar.bz2 | |
sort out inspector linking errors
| -rw-r--r-- | V8Binding/V8Binding.derived.mk | 10 | ||||
| -rw-r--r-- | WebCore/bindings/v8/DerivedSourcesAllInOne.cpp | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/V8Binding/V8Binding.derived.mk b/V8Binding/V8Binding.derived.mk index 0bfd6a1..ab4841a 100644 --- a/V8Binding/V8Binding.derived.mk +++ b/V8Binding/V8Binding.derived.mk @@ -119,7 +119,6 @@ WEBCORE_SRC_FILES := \ bindings/v8/custom/V8HTMLPlugInElementCustom.cpp \ bindings/v8/custom/V8HTMLSelectElementCollectionCustom.cpp \ bindings/v8/custom/V8HTMLSelectElementCustom.cpp \ - bindings/v8/custom/V8InspectorBackendCustom.cpp \ bindings/v8/custom/V8LocationCustom.cpp \ bindings/v8/custom/V8MessageChannelConstructor.cpp \ bindings/v8/custom/V8MessagePortCustom.cpp \ @@ -379,15 +378,6 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) # above rules. Specifying this explicitly makes -j2 work. $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h -GEN := \ - $(intermediates)/bindings/V8InspectorBackend.h \ - $(intermediates)/bindings/V8JavaScriptCallFrame.h - -$(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(WEBCORE_PATH) perl -I$(WEBCORE_PATH)/bindings/scripts $(WEBCORE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --outputdir $(dir $@) $< -$(GEN): $(intermediates)/bindings/V8%.h : $(WEBCORE_PATH)/inspector/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - # We also need the .cpp files, which are generated as side effects of the # above rules. Specifying this explicitly makes -j2 work. $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)/bindings/%.h diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp index e84a71b..e2d4fd1 100644 --- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp +++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp @@ -149,7 +149,11 @@ #include "bindings/V8HTMLUListElement.cpp" #include "bindings/V8HTMLVideoElement.cpp" #include "bindings/V8ImageData.cpp" +#if PLATFORM(ANDROID) +// No inspector for now +#else #include "bindings/V8InspectorBackend.cpp" +#endif #include "bindings/V8KeyboardEvent.cpp" #include "bindings/V8Location.cpp" #include "bindings/V8Media.cpp" |