Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(860)

Side by Side Diff: sky/shell/ios/main_ios.mm

Issue 1185813005: Add temporary workaround for boringssl attempting to access the auxillary vector (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <UIKit/UIKit.h> 5 #import <UIKit/UIKit.h>
6 #include <asl.h> 6 #include <asl.h>
7 #import "sky_app_delegate.h" 7 #import "sky_app_delegate.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/mac/scoped_nsautorelease_pool.h" 12 #include "base/mac/scoped_nsautorelease_pool.h"
13 #include "ui/gl/gl_surface.h" 13 #include "ui/gl/gl_surface.h"
14 14
15 extern "C" {
16 // TODO(csg): HACK! boringssl accesses this on Android using a weak symbol
17 // instead of a global. Till the patch for that lands and propagates to Sky, we
18 // specify the same here to get workable builds on iOS. This is a hack! Will
19 // go away.
20 unsigned long getauxval(unsigned long type) {
21 return 0;
22 }
23 }
24
15 static void InitializeLogging() { 25 static void InitializeLogging() {
16 logging::LoggingSettings settings; 26 logging::LoggingSettings settings;
17 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 27 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
18 logging::InitLogging(settings); 28 logging::InitLogging(settings);
19 logging::SetLogItems(false, // Process ID 29 logging::SetLogItems(false, // Process ID
20 false, // Thread ID 30 false, // Thread ID
21 false, // Timestamp 31 false, // Timestamp
22 false); // Tick count 32 false); // Tick count
23 } 33 }
24 34
(...skipping 26 matching lines...) Expand all
51 result = base::CommandLine::Init(0, nullptr); 61 result = base::CommandLine::Init(0, nullptr);
52 DLOG_ASSERT(result); 62 DLOG_ASSERT(result);
53 InitializeLogging(); 63 InitializeLogging();
54 result = base::i18n::InitializeICU(); 64 result = base::i18n::InitializeICU();
55 DLOG_ASSERT(result); 65 DLOG_ASSERT(result);
56 result = gfx::GLSurface::InitializeOneOff(); 66 result = gfx::GLSurface::InitializeOneOff();
57 DLOG_ASSERT(result); 67 DLOG_ASSERT(result);
58 return UIApplicationMain(argc, argv, nil, 68 return UIApplicationMain(argc, argv, nil,
59 NSStringFromClass([SkyAppDelegate class])); 69 NSStringFromClass([SkyAppDelegate class]));
60 } 70 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698