path: root/tools/buildscripts/
diff options
authorZeno Albisser <>2014-12-03 15:34:09 +0100
committerZeno Albisser <>2015-01-20 08:34:08 +0100
commit390a6fda73369e447569efb1e8a7622460307d22 (patch)
treee4a887e1aab1c04809c001578182add78df7c9b4 /tools/buildscripts/
parent91cc1c217bd370f27dc1f063f70dec3786a1f3bf (diff)
Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.
* scoped_refptr operator for implicit conversion to pointer has been disabled upstream: * Group permission API as done upstream: * content_worker gyp target has been removed upstream. * GetPageThumbnailData moved to DevToolsManagerDelegate. * ui/ui_resources has been renamed to ui/resources * WebPreferences and ResourceType have moved inside content. * Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale(): * Remove obsolete accessibility events. * AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED * AX_ROLE_MATH_ELEMENT was removed upstream. * Screen::IsDIPEnabled has been removed upstream. * Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate. * Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate * DevToolsHttpHandler::Start expects a scoped_ptr now. * Make sure event_factory_evdev.h is not included when USE_OZONE is not defined * ErrorPageParams was moved into namespace error_page. * Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission * SpecialStoragePolicy moved to namespace storage * Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate. * RenderPass::Id was renamed to RenderPass::RenderPassId * Include view_messages.h for ViewHostMsg_TextInputState_Param * CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium: * MailboxManager::ConsumeTexture only takes the mailbox as an argument * Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged. * RenderWidgetHostView::ScrollOffsetChanged has been removed. * SkBitmap::Config was removed upstream. * CopyFromCompositingSurfaceCallback has become an own type. * AcceleratedSurfaceInitialized only takes route_id as an argument. * ServerBoundCertService has been renamed to ChannelIDService. Related API has been renamed accordingly. * TextureImageTransportSurface was removed upstream. * Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature. * AudioStream related functions are gone upstream. * Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset. * Include generic touch_device implementation. * switches::kDisableDesktopNotifications was removed upstream. * PageTransition moved to ui. * Messages headers are not guarded. Including them multiple times does hurt. * ScaleGestureDetector does not create a standalone GestureDetector anymore. * MotionEvent::Cancel and Clone are not virtual anymore. * Exclude os_exchange_data_provider_mac from build. * Remove argument from ScopedClipboardWriter ctor. * Remove ShowPopupMenu override from WebContentsQt. The function is not pure virtual anymore, and we never implemented any specifics. * Do not use clang on desktop linux. * Request functions in ContentBrowserClient were merged into RequestPermission. * ninja: use --bootstrap instead of Change-Id: I3575612826db7845461a949b4e737264bb4e8d88 Reviewed-by: Pierre Rossi <>
Diffstat (limited to 'tools/buildscripts/')
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/buildscripts/ b/tools/buildscripts/
index 389e9b1fd..da3164b4d 100755
--- a/tools/buildscripts/
+++ b/tools/buildscripts/
@@ -85,16 +85,16 @@ def calc_inputs(locale):
inputs = []
if OS != 'ios':
- #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
- inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
- 'webkit_strings_%s.pak' % locale))
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak'
+ inputs.append(os.path.join(SHARE_INT_DIR, 'content', 'app', 'strings',
+ 'content_strings_%s.pak' % locale))
- #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak',
- inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'ui_strings',
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_da.pak',
+ inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
'ui_strings_%s.pak' % locale))
- #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',
- inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'app_locale_settings',
+ #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_da.pak',
+ inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
'app_locale_settings_%s.pak' % locale))
# Used for localized error messages and error pages