Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 74.0.3729.131 to Chromium 74.0.3729.157 #4452

Merged
merged 2 commits into from
May 15, 2019

Conversation

bsclifton
Copy link
Member

Fixes #4443
Related brave/brave-core#2448

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions.

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@bsclifton bsclifton added this to the 0.64.x - Hotfix 1 milestone May 15, 2019
@bsclifton bsclifton self-assigned this May 15, 2019
@bsclifton bsclifton changed the title Upgrade from Chromium "74.0.3729.131" to Chromium 74.0.3729.157 Upgrade from Chromium 74.0.3729.131 to Chromium 74.0.3729.157 May 15, 2019
@bsclifton
Copy link
Member Author

bsclifton commented May 15, 2019

CI to watch: https://staging.ci.brave.com/job/brave-browser-build-pr/job/PR-4452/1/

NOTE: remove temp commit before merging

@bsclifton bsclifton requested review from bbondy and emerick May 15, 2019 00:11
@bsclifton
Copy link
Member Author

Getting an error on this one:

[5108/17327] CXX obj/chrome/browser/browser/local_ntp_source.o
FAILED: obj/chrome/browser/browser/local_ntp_source.o
/Users/clifton/Documents/brave-browser2/src/brave/script/redirect-cc.py ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/chrome/browser/browser/local_ntp_source.o.d -DZLIB_CONST -DBRAVE_CHROMIUM_BUILD -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -D_LIBCPP_HAS_NO_ALIGNED_ALLOCATION -DCR_XCODE_VERSION=1010 -DCR_CLANG_REVISION=\"351477-1\" -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D_LIBCPP_ABI_UNSTABLE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DCR_LIBCXX_REVISION=355550 -DCR_LIBCXXABI_REVISION=354284 -D_LIBCPP_ENABLE_NODISCARD -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DUSE_CUPS -DENABLE_IPC_FUZZER -DWEBP_EXTERN=extern -DUSE_EGL -DTOOLKIT_VIEWS=1 -DEXPAT_RELATIVE_PATH -DSYNC_PASSWORD_REUSE_DETECTION_ENABLED -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DSK_BUILD_FOR_MAC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DV8_USE_EXTERNAL_STARTUP_DATA -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_MAC -DABSL_ALLOCATOR_NOTHROW=1 -DNO_MAIN_THREAD_WRAPPING -DLEVELDB_PLATFORM_CHROMIUM=1 -DLEVELDB_PLATFORM_CHROMIUM=1 -DV8_DEPRECATION_WARNINGS -DI18N_ADDRESS_VALIDATION_DATA_URL=\"https://chromium-i18n.appspot.com/ssl-aggregate-address/\" -DPERFETTO_BUILD_WITH_EMBEDDER -DPERFETTO_BUILD_WITH_CHROMIUM -DPERFETTO_FORCE_DLOG=0 -DAUDIO_PROCESSING_IN_AUDIO_SERVICE -DHUNSPELL_STATIC -DHUNSPELL_CHROME_CLIENT -DUSE_HUNSPELL -I../../brave/chromium_src -I../.. -Igen -I../../third_party/libwebp/src -I../../third_party/libyuv/include -I../../third_party/khronos -I../../gpu -I../../third_party/ced/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/codec -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/docs -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/pathops -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/modules/skottie/include -I../../third_party/protobuf/src -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/boringssl/src/include -I../../third_party/webrtc_overrides -I../../third_party/webrtc -Igen/third_party/webrtc -I../../third_party/abseil-cpp -I../../third_party/libwebm/source -I../../third_party/leveldatabase -I../../third_party/leveldatabase/src -I../../third_party/leveldatabase/src/include -I../../v8/include -Igen/v8/include -Igen/third_party/metrics_proto -I../../third_party/re2/src -I../../third_party/mesa_headers -Igen -Igen -Igen -Igen -I../../third_party/google_toolbox_for_mac -I../../third_party/google_toolbox_for_mac/src -I../../third_party/google_toolbox_for_mac/src/AppKit -I../../third_party/google_toolbox_for_mac/src/DebugUtils -I../../third_party/google_toolbox_for_mac/src/Foundation -I../../third_party/libaddressinput/src/cpp/include -I../../third_party/perfetto/include -Igen/third_party/perfetto/protos -I../../testing/gtest/include -Igen/third_party/perfetto/protos -Igen/third_party/perfetto/protos -Igen/third_party/perfetto/protos -Igen/third_party/perfetto/protos -Igen -Igen -Igen -Igen -I../../third_party/cacheinvalidation/overrides -I../../third_party/cacheinvalidation/src -Igen/components/sync/protocol -I../../third_party/flatbuffers/src/include -I../../third_party/libxml/src/include -I../../third_party/libxml/mac/include -I../../third_party/zlib -I../../third_party/crashpad/crashpad -I../../third_party/crashpad/crashpad/compat/mac -I../../third_party/crashpad/crashpad/compat/non_win -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -fmerge-all-constants -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fcomplete-member-pointers -arch x86_64 -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -no-canonical-prefixes -Wall -Werror -Wextra -Wimplicit-fallthrough -Wthread-safety -Wunguarded-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-unneeded-internal-declaration -Wno-undefined-var-template -Wno-ignored-pragma-optimize -O0 -fno-omit-frame-pointer -gdwarf-2 -isysroot ../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -mmacosx-version-min=10.10.0 -fvisibility=hidden -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wexit-time-destructors -Wno-shorten-64-to-32 -DLIBXML_STATIC= -std=c++14 -stdlib=libc++ -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -include obj/chrome/browser/browser/precompile.h-cc -c ../../chrome/browser/search/local_ntp_source.cc -o obj/chrome/browser/browser/local_ntp_source.o
../../chrome/browser/search/local_ntp_source.cc:191:17: error: use of undeclared identifier 'IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_SHORT'
                IDS_GOOGLE_SEARCH_BOX_EMPTY_HINT_SHORT);

@bsclifton
Copy link
Member Author

bsclifton commented May 15, 2019

Issue found 😄Needed to pull in new strings per https://github.com/brave/brave-browser/wiki/Chromium-rebases#fix-strings

@bsclifton bsclifton requested a review from simonhong May 15, 2019 05:35
@bsclifton
Copy link
Member Author

I suspect Jenkins had old workspace filed cached; restarted job with https://staging.ci.brave.com/job/brave-browser-build-pr/job/PR-4452/3/

If this passes, we should be good to merge! 😄

Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bsclifton
Copy link
Member Author

Windows had a browser test failure during initial run; I replayed just Windows and it worked great on second try 😄 Merging!

@bsclifton bsclifton merged commit d63403d into 0.64.x May 15, 2019
@bsclifton bsclifton deleted the 74.0.3729.157_0.64.x_23 branch May 15, 2019 19:57
bsclifton added a commit that referenced this pull request May 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants