Merge Chromium src@r53293

Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34

2 files changed, 148 insertions, 0 deletions

diff --git a/sdch/sdch.Makefile b/sdch/sdch.Makefile
new file mode 100644
index 0000000..adfbab9
--- /dev/null
+++ b/sdch/sdch.Makefile
@@ -0,0 +1,6 @@
+# This file is generated by gyp; do not edit.
+
+export builddir_name ?= /usr/local/google/src/chromium-merge/src/sdch/out
+.PHONY: all
+all:
+	$(MAKE) -C .. sdch
diff --git a/sdch/sdch.target.mk b/sdch/sdch.target.mk
new file mode 100644
index 0000000..49b5959
--- /dev/null
+++ b/sdch/sdch.target.mk
@@ -0,0 +1,142 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := sdch
+DEFS_Debug := '-DNO_HEAPCHECKER' \
+	'-DCHROMIUM_BUILD' \
+	'-DENABLE_REMOTING=1' \
+	'-DENABLE_GPU=1' \
+	'-D__STDC_FORMAT_MACROS' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+	'-D_DEBUG'
+
+# Flags passed to both C and C++ files.
+CFLAGS_Debug := -Werror \
+	-pthread \
+	-fno-exceptions \
+	-Wall \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-D_FILE_OFFSET_BITS=64 \
+	-fvisibility=hidden \
+	-fno-strict-aliasing \
+	-O0 \
+	-g
+
+# Flags passed to only C (and not C++) files.
+CFLAGS_C_Debug := 
+
+# Flags passed to only C++ (and not C) files.
+CFLAGS_CC_Debug := -fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden
+
+INCS_Debug := -Isdch/open-vcdiff/src \
+	-Isdch/linux
+
+DEFS_Release := '-DNO_HEAPCHECKER' \
+	'-DCHROMIUM_BUILD' \
+	'-DENABLE_REMOTING=1' \
+	'-DENABLE_GPU=1' \
+	'-D__STDC_FORMAT_MACROS' \
+	'-DNDEBUG' \
+	'-DNVALGRIND' \
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+# Flags passed to both C and C++ files.
+CFLAGS_Release := -Werror \
+	-pthread \
+	-fno-exceptions \
+	-Wall \
+	-Wno-unused-parameter \
+	-Wno-missing-field-initializers \
+	-D_FILE_OFFSET_BITS=64 \
+	-fvisibility=hidden \
+	-fno-strict-aliasing \
+	-O2 \
+	-fno-ident \
+	-fdata-sections \
+	-ffunction-sections
+
+# Flags passed to only C (and not C++) files.
+CFLAGS_C_Release := 
+
+# Flags passed to only C++ (and not C) files.
+CFLAGS_CC_Release := -fno-rtti \
+	-fno-threadsafe-statics \
+	-fvisibility-inlines-hidden
+
+INCS_Release := -Isdch/open-vcdiff/src \
+	-Isdch/linux
+
+OBJS := $(obj).target/$(TARGET)/sdch/open-vcdiff/src/addrcache.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/adler32.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/blockhash.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/codetable.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/decodetable.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/encodetable.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/headerparser.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/instruction_map.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/logging.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/varint_bigendian.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/vcdecoder.o \
+	$(obj).target/$(TARGET)/sdch/open-vcdiff/src/vcdiffengine.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.c FORCE_DO_CMD
+	@$(call do_cmd,cc,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := -pthread \
+	-Wl,-z,noexecstack \
+	-rdynamic
+
+LDFLAGS_Release := -pthread \
+	-Wl,-z,noexecstack \
+	-Wl,--gc-sections
+
+LIBS := 
+
+$(obj).target/sdch/libsdch.a: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(obj).target/sdch/libsdch.a: LIBS := $(LIBS)
+$(obj).target/sdch/libsdch.a: TOOLSET := $(TOOLSET)
+$(obj).target/sdch/libsdch.a: $(OBJS) FORCE_DO_CMD
+	$(call do_cmd,alink)
+
+all_deps += $(obj).target/sdch/libsdch.a
+# Add target alias
+.PHONY: sdch
+sdch: $(obj).target/sdch/libsdch.a
+
+# Add target alias to "all" target.
+.PHONY: all
+all: sdch
+