Create a SkyShell.apk
This CL introduces a SkyShell.apk that is separate from the SkyDemo.apk that we upload to the store to show our demos. The SkyShell.apk is just an empty shell that can run Sky applications on Android.
This commit is contained in:
@@ -25,13 +25,10 @@ group("sky_dev") {
|
||||
deps = [
|
||||
"//sky/sdk",
|
||||
"//sky/sdk/example/demo_launcher",
|
||||
"//sky/shell",
|
||||
]
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//sky/services/activity" ]
|
||||
}
|
||||
|
||||
if (is_linux || is_ios) {
|
||||
deps += [ "//sky/shell" ]
|
||||
}
|
||||
}
|
||||
|
||||
6
engine/src/flutter/sky/dist/BUILD.gn
vendored
6
engine/src/flutter/sky/dist/BUILD.gn
vendored
@@ -18,11 +18,11 @@ copy("sky_viewer") {
|
||||
copy("sky_shell") {
|
||||
if (is_android) {
|
||||
sources = [
|
||||
"$root_build_dir/apks/SkyDemo.apk",
|
||||
"$root_build_dir/apks/SkyShell.apk",
|
||||
]
|
||||
|
||||
deps = [
|
||||
"//sky/sdk/example/demo_launcher",
|
||||
"//sky/shell",
|
||||
]
|
||||
} else if (is_ios) {
|
||||
sources = [
|
||||
@@ -76,7 +76,7 @@ if (is_android) {
|
||||
|
||||
copy("copy_sky_sdk_apks") {
|
||||
sources = [
|
||||
"$root_dist_dir/shell/SkyDemo.apk",
|
||||
"$root_dist_dir/shell/SkyShell.apk",
|
||||
]
|
||||
outputs = [ "$sky_sdk_dir/apks/{{source_file_part}}" ]
|
||||
deps = [
|
||||
|
||||
@@ -49,7 +49,7 @@ GS_URL = 'gs://mojo/sky/%(category)s/%(config)s/%(commit_hash)s/%(name)s'
|
||||
|
||||
ARTIFACTS = {
|
||||
'android-arm': [
|
||||
Artifact('shell', 'SkyDemo.apk'),
|
||||
Artifact('shell', 'SkyShell.apk'),
|
||||
Artifact('viewer', 'sky_viewer.mojo'),
|
||||
],
|
||||
'linux-x64': [
|
||||
|
||||
@@ -27,14 +27,14 @@ GDB_PORT = 8888
|
||||
SKY_SERVER_PORT = 9888
|
||||
OBSERVATORY_PORT = 8181
|
||||
DEFAULT_URL = "https://domokit.github.io/home.dart"
|
||||
APK_NAME = 'SkyDemo.apk'
|
||||
APK_NAME = 'SkyShell.apk'
|
||||
ADB_PATH = os.path.join(SRC_ROOT,
|
||||
'third_party/android_tools/sdk/platform-tools/adb')
|
||||
ANDROID_PACKAGE = "org.domokit.sky.demo"
|
||||
ANDROID_COMPONENT = '%s/%s.SkyDemoActivity' % (ANDROID_PACKAGE, ANDROID_PACKAGE)
|
||||
ANDROID_PACKAGE = "org.domokit.sky.shell"
|
||||
ANDROID_COMPONENT = '%s/%s.SkyActivity' % (ANDROID_PACKAGE, ANDROID_PACKAGE)
|
||||
SHA1_PATH = '/sdcard/%s/%s.sha1' % (ANDROID_PACKAGE, APK_NAME)
|
||||
|
||||
PID_FILE_PATH = "/tmp/skydemo.pids"
|
||||
PID_FILE_PATH = "/tmp/shelldb.pids"
|
||||
PID_FILE_KEYS = frozenset([
|
||||
'remote_sky_server_port',
|
||||
'sky_server_pid',
|
||||
@@ -141,7 +141,7 @@ class StartSky(object):
|
||||
default=DEFAULT_URL)
|
||||
start_parser.add_argument('--no_install', action="store_false",
|
||||
default=True, dest="install",
|
||||
help="Don't install SkyDemo.apk before starting")
|
||||
help="Don't install SkyShell.apk before starting")
|
||||
start_parser.set_defaults(func=self.run)
|
||||
|
||||
def _server_root_for_url(self, url_or_path):
|
||||
@@ -435,7 +435,7 @@ class StartTracing(object):
|
||||
def run(self, args, pids):
|
||||
subprocess.check_output([ADB_PATH, 'shell',
|
||||
'am', 'broadcast',
|
||||
'-a', 'org.domokit.sky.demo.TRACING_START'])
|
||||
'-a', 'org.domokit.sky.shell.TRACING_START'])
|
||||
|
||||
|
||||
TRACE_COMPLETE_REGEXP = re.compile('Trace complete')
|
||||
@@ -451,7 +451,7 @@ class StopTracing(object):
|
||||
subprocess.check_output([ADB_PATH, 'logcat', '-c'])
|
||||
subprocess.check_output([ADB_PATH, 'shell',
|
||||
'am', 'broadcast',
|
||||
'-a', 'org.domokit.sky.demo.TRACING_STOP'])
|
||||
'-a', 'org.domokit.sky.shell.TRACING_STOP'])
|
||||
device_path = None
|
||||
is_complete = False
|
||||
while not is_complete:
|
||||
|
||||
Reference in New Issue
Block a user