← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/rules

* Merge with chromium-browser.stable #583

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
130
130
GYP_DEFINES += no_strict_aliasing=1 gcc_version=44
131
131
endif
132
132
 
 
133
# See http://code.google.com/p/chromium/issues/detail?id=49533
 
134
ifeq (4.5,$(CC_VERSION))
 
135
GYP_DEFINES += werror=$(NULL)
 
136
endif
 
137
 
133
138
ifeq (1,$(WANT_LZMA_SRC))
134
139
TAR_EXT   := lzma
135
140
TAR_FLAGS := --lzma
169
174
        mksnapshot \
170
175
        ncdecode_table \
171
176
        ncdecode_tablegen \
 
177
        ssl_false_start_blacklist_process \
172
178
        protoc \
173
179
        gfx_unittests \
174
180
        linker.lock \
538
544
endif
539
545
        # Checkout (drop the previous content and retry if gclient failed, see http://crbug.com/39954)
540
546
        cd $(TMP_DIR) && ./tools/depot_tools/gclient update --nohooks $(REVISION) || \
541
 
          ( rm -rf $(foreach dir,src [0-9]*,$(wildcard $(TMP_DIR)/$(dir))) ; ./tools/depot_tools/gclient update --nohooks $(REVISION) )
 
547
          ( perl -i -pe 's,http://src.chromium.org/git,http://git.chromium.org/git,' */DEPS ; \
 
548
            ./tools/depot_tools/gclient update --nohooks $(REVISION) ) || \
 
549
          ( rm -rf $(foreach dir,src [0-9]*,$(wildcard $(TMP_DIR)/$(dir))) ; \
 
550
           ./tools/depot_tools/gclient update --nohooks $(REVISION) )
542
551
 
543
552
ifneq (,$(LOCAL_BRANCH))
544
553
        rm -rf $(TMP_DDIR)