不幸的问题还是出现了：Chromium代码上整理patch（working目录/master分支），部分文件做了git checkout恢复，结果GYP再编译就出错了

redtea@Lenovo:~/Projects/Chromium/src$ ninja -C out/Release android_webview_apk
ninja: Entering directory `out/Release'
[3/24] CXX obj/android_webview/browser/android_webview_common.shared_renderer_state.o
FAILED: /home/redtea/Projects/Chromium/src/third_party/android_tools/ndk//toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -MMD -MF obj/android_webview/browser/android_webview_common.shared_renderer_state.o.d -DV8_DEPRECATION_WARNINGS -D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DDISABLE_NACL -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO=1 -DENABLE_PROFILING=1 -DENABLE_WEBRTC=1 -DUSE_PROPRIETARY_CODECS -DENABLE_BROWSER_CDMS -DENABLE_CONFIGURATION_POLICY -DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DENABLE_EGLIMAGE=1 -DENABLE_AUTOFILL_DIALOG=1 -DCLD_VERSION=1 -DENABLE_PRINTING=1 -DENABLE_MANAGED_USERS=1 -DVIDEO_HOLE=1 -DENABLE_LOAD_COMPLETION_HACKS=1 -DMOJO_USE_SYSTEM_IMPL -DLIBPEERCONNECTION_LIB=1 -DAPPCACHE_USE_SIMPLE_CACHE -DMEDIA_DISABLE_LIBVPX -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT -DSK_SUPPORT_LEGACY_TEXTRENDERMODE -DSK_BUILD_FOR_ANDROID -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG -DCHROME_PNG_READ_PACK_SUPPORT -DMESA_EGL_NO_X11_HEADERS -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DANDROID -D__GNU_SOURCE=1 -DUSE_STLPORT=1 -D_STLP_USE_PTR_SPECIALIZATIONS=1 '-DCHROME_BUILD_ID=""' -DHAVE_SYS_UIO_H -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -Igen -I../.. -I../../skia/config -Igen/ui/resources/ -I../../third_party/khronos -I../../gpu -I../../third_party/WebKit/Source -Igen/angle -I../../third_party/WebKit -I../../third_party/skia/src/core -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -I../../third_party/WebKit -I../../third_party/icu/source/common -I../../third_party/npapi -I../../third_party/npapi/bindings -I../../v8/include -I../../third_party/libpng -I../../third_party/zlib -I../../third_party/libwebp -I../../third_party/ots/include -I../../third_party/qcms/src -I../../third_party/iccjpeg -I../../third_party/libjpeg_turbo -Igen/ui/gl -I../../third_party/mesa/src/include -fstack-protector --param=ssp-buffer-size=4 -Werror -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wno-unused-local-typedefs -march=armv7-a -mtune=generic-armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -mthumb -fno-tree-sra -fno-caller-saves -Wno-psabi -mthumb-interwork -marm -mapcs-frame -fno-optimize-sibling-calls -ffunction-sections -funwind-tables -g -fstack-protector -fno-short-enums -finline-limit=64 -Wa,--noexecstack -fno-omit-frame-pointer --sysroot=/home/redtea/Projects/Chromium/src/third_party/android_tools/ndk//platforms/android-14/arch-arm -isystem/home/redtea/Projects/Chromium/src/third_party/android_tools/ndk//sources/cxx-stl/stlport/stlport -Os -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g -funwind-tables -fno-omit-frame-pointer -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -Wno-abi -std=gnu++11 -Wno-narrowing -Wno-literal-suffix  -c ../../android_webview/browser/shared_renderer_state.cc -o obj/android_webview/browser/android_webview_common.shared_renderer_state.o
../../android_webview/browser/shared_renderer_state.cc: In member function 'void android_webview::SharedRendererState::UpdateParentDrawConstraintsOnUIThread()':
../../android_webview/browser/shared_renderer_state.cc:153:15: error: variable 'prevent_recursive_call' set but not used [-Werror=unused-but-set-variable]
   static bool prevent_recursive_call = false; //FIXME: should be atomic<bool> here;
               ^
In file included from ../../base/memory/weak_ptr.h:68:0,
                 from ../../base/bind_helpers.h:148,
                 from ../../base/bind_internal.h:13,
                 from ../../base/bind.h:13,
                 from ../../base/cancelable_callback.h:46,
                 from ../../android_webview/browser/shared_renderer_state.h:9,
                 from ../../android_webview/browser/shared_renderer_state.cc:5:
../../android_webview/browser/shared_renderer_state.cc: At global scope:
../../base/logging.h:355:3: error: expected unqualified-id before '!' token
   !(condition) ? (void) 0 : ::logging::LogMessageVoidify() & (stream)
   ^
../../base/logging.h:622:3: note: in expansion of macro 'LAZY_STREAM'
   LAZY_STREAM(LOG_STREAM(DCHECK), DCHECK_IS_ON && !(condition))   \
   ^
../../android_webview/browser/shared_renderer_state.cc:166:3: note: in expansion of macro 'DCHECK'
   DCHECK(ui_loop_->BelongsToCurrentThread());
   ^
../../android_webview/browser/shared_renderer_state.cc:167:3: error: 'client_on_ui_' does not name a type
   client_on_ui_->UpdateParentDrawConstraints();
   ^
../../android_webview/browser/shared_renderer_state.cc:170:3: error: expected unqualified-id before '{' token
   {
   ^
../../android_webview/browser/shared_renderer_state.cc:175:6: error: 'SharedRendererState' has not been declared
 bool SharedRendererState::HasDrawGLInput() const {
      ^
../../android_webview/browser/shared_renderer_state.cc:175:44: error: non-member function 'bool HasDrawGLInput()' cannot have cv-qualifier
 bool SharedRendererState::HasDrawGLInput() const {
                                            ^
../../android_webview/browser/shared_renderer_state.cc: In function 'bool HasDrawGLInput()':
../../android_webview/browser/shared_renderer_state.cc:176:23: error: 'lock_' was not declared in this scope
   base::AutoLock lock(lock_);
                       ^
../../android_webview/browser/shared_renderer_state.cc:177:10: error: 'draw_gl_input_' was not declared in this scope
   return draw_gl_input_.get();
      &