preserve third_party/protobuf/src/google/protobuf/testing when building with bundled...

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 56785a125b0c600a0847d089ae3d39c212a3da5d..8dc2a19420cbcaa231f7c400f2b4b6c33ec56562 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -91,7 +91,7 @@ Source0:      http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{
 # Source0-md5: 662f134029f2d6484873ec3c93a8e049
 %if "%{?patchver}" != ""
 Patch0:                http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
-# Patch0-md5:  d810c6bc3a40bbab1f04c8af397d93a1
+# Patch0-md5:  6ed1a30145827a1ce9f306a7ebdf1f0f
 %endif
 Source1:       %{name}.default
 Source2:       %{name}.sh

diff --git a/clean-source.sh b/clean-source.sh
index 893dfe98c6cbbd48f54d650b5d7422fc91f9503b..27ea57d5b2ca8e5aef9d0398e254be01cf9f10e8 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -651,7 +651,6 @@ clean_third_party() {
                '!' -path 'third_party/polymer/*' \
                '!' -path 'third_party/polymer_legacy/*' \
                '!' -path 'third_party/protobuf/*' \
-               '!' -path 'third_party/protobuf/*' \
                '!' -path 'third_party/qcms/*' \
                '!' -path 'third_party/re2/*' \
                '!' -path 'third_party/readability/*' \
@@ -853,7 +852,7 @@ remove_tests() {
        third_party/openssl/openssl/test \
        third_party/ots/test \
        third_party/protobuf/src/google/protobuf/testdata \
-       third_party/protobuf/src/google/protobuf/testing \
+       third_party/protobuf/src/google/protobuf/testing_ \
        third_party/re2/re2/testing \
        third_party/safe_browsing/testing \
        third_party/sfntly/cpp/src/test \
@@ -1164,7 +1163,7 @@ strip_system_dirs \
        third_party/libxslt \
        third_party/mesa \
        third_party/opus_ \
-       third_party/protobuf_ \
+       third_party/protobuf \
        third_party/re2 \
        third_party/snappy \
        third_party/speex \