Skip to content

Commit

Permalink
Revert " Started adding the engine hash to frameworks' Info.plist. (#…
Browse files Browse the repository at this point in the history
…9847)"

This reverts commit b7e5940.
  • Loading branch information
chinmaygarde authored Jul 16, 2019
1 parent b7e5940 commit e589b02
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 69 deletions.
33 changes: 0 additions & 33 deletions build/copy_info_plist.py

This file was deleted.

34 changes: 14 additions & 20 deletions build/git_revision.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,26 @@
# found in the LICENSE file.

"""Get the Git HEAD revision of a specified Git repository."""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function

import sys
import subprocess
import os
import argparse

def GetRepositoryVersion(repository):
"Returns the Git HEAD for the supplied repository path as a string."
def main():
parser = argparse.ArgumentParser();

parser.add_argument('--repository',
action='store',
help='Path to the Git repository.',
required=True)

args = parser.parse_args()

repository = os.path.abspath(args.repository)

if not os.path.exists(repository):
raise IOError("path doesn't exist")
exit -1

version = subprocess.check_output([
'git',
Expand All @@ -27,20 +34,7 @@ def GetRepositoryVersion(repository):
'HEAD',
])

return version.strip()

def main():
parser = argparse.ArgumentParser()

parser.add_argument('--repository',
action='store',
help='Path to the Git repository.',
required=True)

args = parser.parse_args()
repository = os.path.abspath(args.repository)
version = GetRepositoryVersion(repository)
print(version.strip())
print (version.strip())

return 0

Expand Down
7 changes: 1 addition & 6 deletions shell/platform/darwin/ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,14 @@ action("copy_dylib_and_update_framework_install_name") {
]
}

action("copy_framework_info_plist") {
script = "$flutter_root/build/copy_info_plist.py"
copy("copy_framework_info_plist") {
visibility = [ ":*" ]
sources = [
"framework/Info.plist",
]
outputs = [
"$_flutter_framework_dir/Info.plist",
]
args = [
rebase_path(sources[0]),
rebase_path(outputs[0]),
]
}

copy("copy_framework_module_map") {
Expand Down
2 changes: 0 additions & 2 deletions shell/platform/darwin/ios/framework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>FlutterEngine<key>
<string>{0}<string>
</dict>
</plist>
7 changes: 1 addition & 6 deletions shell/platform/embedder/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,14 @@ if (is_mac && !embedder_for_target) {
]
}

action("copy_info_plist") {
script = "$flutter_root/build/copy_info_plist.py"
copy("copy_info_plist") {
visibility = [ ":*" ]
sources = [
"assets/EmbedderInfo.plist",
]
outputs = [
"$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist",
]
args = [
rebase_path(sources[0]),
rebase_path(outputs[0]),
]
}

copy("copy_module_map") {
Expand Down
2 changes: 0 additions & 2 deletions shell/platform/embedder/assets/EmbedderInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,5 @@
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2013 The Flutter Authors. All rights reserved.</string>
<key>FlutterEngine<key>
<string>{0}<string>
</dict>
</plist>

0 comments on commit e589b02

Please sign in to comment.