Skip to content

Commit

Permalink
add electron version to framework
Browse files Browse the repository at this point in the history
  • Loading branch information
groundwater committed Aug 24, 2018
1 parent e6e3ccf commit 62750bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
16 changes: 2 additions & 14 deletions BUILD.gn
Expand Up @@ -32,12 +32,6 @@ declare_args() {
enable_desktop_capturer = true
enable_run_as_node = true
enable_osr = false

# Provide a fake location provider for mocking
# the geolocation responses. Disable it if you
# need to test with chromium's location provider.
# Should not be enabled for release build.
enable_fake_location_provider = !is_official_build
}

if (is_mas_build) {
Expand Down Expand Up @@ -288,13 +282,6 @@ static_library("electron_lib") {
]
}

if (enable_fake_location_provider) {
defines += [
"OVERRIDE_LOCATION_PROVIDER"
]
sources += filenames_gypi.lib_sources_location_provider
}

if (is_mac) {
deps += [
"//third_party/crashpad/crashpad/client",
Expand Down Expand Up @@ -390,6 +377,7 @@ static_library("electron_lib") {
}

if (enable_desktop_capturer) {
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
sources += [
"atom/browser/api/atom_api_desktop_capturer.cc",
"atom/browser/api/atom_api_desktop_capturer.h",
Expand Down Expand Up @@ -494,7 +482,7 @@ if (is_mac) {
deps += [ ":electron_crashpad_helper" ]
}
info_plist = "atom/common/resources/mac/Info.plist"
extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework" ]
extra_substitutions = [ "ATOM_BUNDLE_ID=$electron_mac_bundle_id.framework", "ELECTRON_VERSION=$electron_version" ]

include_dirs = [ "." ]
sources = filenames_gypi.framework_sources
Expand Down
2 changes: 2 additions & 0 deletions atom/common/resources/mac/Info.plist
Expand Up @@ -12,5 +12,7 @@
<string>FMWK</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>Version</key>
<string>${ELECTRON_VERSION}</string>
</dict>
</plist>

0 comments on commit 62750bd

Please sign in to comment.