mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix building on OS X

Browse source
This commit is contained in:
Cheng Zhao 2015-11-13 13:03:00 +08:00
parent 83ae9f8d71
commit 05d2e431de
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chromium_src/chrome/common/chrome_constants.cc
View file

@ -3,10 +3,16 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_version.h"
#define FPL FILE_PATH_LITERAL
namespace chrome { namespace chrome {
#if defined(OS_MACOSX)
const base::FilePath::CharType kFrameworkName[] =
FPL(ATOM_PRODUCT_NAME " Framework.framework");
#endif // OS_MACOSX
// filenames // filenames
const base::FilePath::CharType kCacheDirname[] = FPL("Cache"); const base::FilePath::CharType kCacheDirname[] = FPL("Cache");
const base::FilePath::CharType kChannelIDFilename[] = FPL("Origin Bound Certs"); const base::FilePath::CharType kChannelIDFilename[] = FPL("Origin Bound Certs");

8
chromium_src/chrome/common/chrome_constants.h
View file

@ -11,6 +11,14 @@
namespace chrome { namespace chrome {
#if defined(OS_MACOSX)
// NOTE: if you change the value of kFrameworkName, please don't forget to
// update components/test/run_all_unittests.cc as well.
// TODO(tfarina): Remove the comment above, when you fix components to use plist
// on Mac.
extern const base::FilePath::CharType kFrameworkName[];
#endif // OS_MACOSX
// filenames // filenames
extern const base::FilePath::CharType kCacheDirname[]; extern const base::FilePath::CharType kCacheDirname[];
extern const base::FilePath::CharType kChannelIDFilename[]; extern const base::FilePath::CharType kChannelIDFilename[];

3
chromium_src/chrome/common/chrome_paths_mac.mm
View file

@ -179,10 +179,9 @@ base::FilePath GetVersionedDirectory() {
// .app's versioned directory. Go up two steps to get to the browser // .app's versioned directory. Go up two steps to get to the browser
// .app's versioned directory. // .app's versioned directory.
path = path.DirName().DirName(); path = path.DirName().DirName();
DCHECK_EQ(path.BaseName().value(), kChromeVersion);
} else { } else {
// Go into the versioned directory. // Go into the versioned directory.
path = path.Append("Versions").Append(kChromeVersion); path = path.Append("Frameworks");
} }
return path; return path;