diff --git a/BUILD.gn b/BUILD.gn index e14938f285827587415bad1a18e1710a558ed96a..8955524c85d2439e194856405287275e40490478 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -30,10 +30,7 @@ group("sky_apk") { ] if (is_android) { - deps += [ - "//sky/apk/demo", - "//sky/services/intents", - ] + deps += [ "//sky/services/intents" ] } if (is_linux) { diff --git a/apk/rules.gni b/build/sky_app.gni similarity index 71% rename from apk/rules.gni rename to build/sky_app.gni index 1dbd905d5532cc181ffe314075ecd768cdae91d9..905a05bb83589dadb9ba6a61986a6b49e56f34d2 100644 --- a/apk/rules.gni +++ b/build/sky_app.gni @@ -2,27 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/config/android/config.gni") import("//build/config/android/rules.gni") import("//sky/build/skyx.gni") -template("sky_apk") { - android_apk(target_name) { - apk_name = invoker.apk_name - android_manifest = invoker.android_manifest - - native_libs = [ "libsky_shell.so" ] - asset_location = "$root_build_dir/sky_shell/assets" - - deps = [ - "//base:base_java", - "//sky/shell:assets", - "//sky/shell:java", - "//sky/shell:sky_shell", - ] + invoker.deps - } -} - template("sky_app") { skyx("app") { main_dart = invoker.main_dart diff --git a/sdk/example/demo_launcher/BUILD.gn b/sdk/example/demo_launcher/BUILD.gn index aec71dc7fe7dfac959054419cf844fe3e0782a88..6792c33638e6b35434247d9d2147c2a13f1aa653 100644 --- a/sdk/example/demo_launcher/BUILD.gn +++ b/sdk/example/demo_launcher/BUILD.gn @@ -2,9 +2,15 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//sky/build/skyx.gni") +import("//sky/build/sky_app.gni") -skyx("demo_launcher") { +sky_app("demo_launcher") { + apk_name = "SkyDemo" main_dart = "lib/main.dart" manifest = "sky.yaml" + + deps = [ + "//sky/sdk/example/demo_launcher/apk:java", + "//sky/sdk/example/demo_launcher/apk:resources", + ] } diff --git a/apk/demo/AndroidManifest.xml b/sdk/example/demo_launcher/apk/AndroidManifest.xml similarity index 100% rename from apk/demo/AndroidManifest.xml rename to sdk/example/demo_launcher/apk/AndroidManifest.xml diff --git a/apk/demo/BUILD.gn b/sdk/example/demo_launcher/apk/BUILD.gn similarity index 82% rename from apk/demo/BUILD.gn rename to sdk/example/demo_launcher/apk/BUILD.gn index a016244edf84726e3621d5d140cc861f2c868060..7e9311092e43fec6e245dced14c96e3955b1c6b8 100644 --- a/apk/demo/BUILD.gn +++ b/sdk/example/demo_launcher/apk/BUILD.gn @@ -6,7 +6,6 @@ assert(is_android) import("//build/config/android/config.gni") import("//build/config/android/rules.gni") -import("//sky/apk/rules.gni") android_library("java") { java_files = [ @@ -30,16 +29,7 @@ android_library("java") { ] } -sky_apk("demo") { - apk_name = "SkyDemo" - android_manifest = "AndroidManifest.xml" - deps = [ - ":java", - ":demo_resources", - ] -} - -android_resources("demo_resources") { +android_resources("resources") { resource_dirs = [ "res" ] android_manifest = "AndroidManifest.xml" } diff --git a/apk/demo/README.md b/sdk/example/demo_launcher/apk/README.md similarity index 100% rename from apk/demo/README.md rename to sdk/example/demo_launcher/apk/README.md diff --git a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java b/sdk/example/demo_launcher/apk/org/domokit/sky/demo/SkyDemoActivity.java similarity index 78% rename from apk/demo/org/domokit/sky/demo/SkyDemoActivity.java rename to sdk/example/demo_launcher/apk/org/domokit/sky/demo/SkyDemoActivity.java index 93ce9f73e45c7fe1a2d9047521fda28657159204..ad97c69be89bdbd990c90c6945649d8a9c0357e1 100644 --- a/apk/demo/org/domokit/sky/demo/SkyDemoActivity.java +++ b/sdk/example/demo_launcher/apk/org/domokit/sky/demo/SkyDemoActivity.java @@ -12,18 +12,11 @@ import org.domokit.sky.shell.SkyActivity; * Main activity for SkyDemo. */ public class SkyDemoActivity extends SkyActivity { - private static final String DEFAULT_URL = "https://domokit.github.io/example/demo_launcher/lib/main.dart"; - @Override protected void onSkyReady() { Intent intent = getIntent(); String action = intent.getAction(); - if (Intent.ACTION_MAIN.equals(action)) { - loadUrl(DEFAULT_URL); - return; - } - if (Intent.ACTION_VIEW.equals(action)) { String bundleName = intent.getStringExtra("bundleName"); if (bundleName != null && loadBundleByName(bundleName)) { diff --git a/apk/demo/org/domokit/sky/demo/SkyDemoApplication.java b/sdk/example/demo_launcher/apk/org/domokit/sky/demo/SkyDemoApplication.java similarity index 100% rename from apk/demo/org/domokit/sky/demo/SkyDemoApplication.java rename to sdk/example/demo_launcher/apk/org/domokit/sky/demo/SkyDemoApplication.java diff --git a/apk/demo/res/mipmap-hdpi/ic_launcher.png b/sdk/example/demo_launcher/apk/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from apk/demo/res/mipmap-hdpi/ic_launcher.png rename to sdk/example/demo_launcher/apk/res/mipmap-hdpi/ic_launcher.png diff --git a/apk/demo/res/mipmap-mdpi/ic_launcher.png b/sdk/example/demo_launcher/apk/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from apk/demo/res/mipmap-mdpi/ic_launcher.png rename to sdk/example/demo_launcher/apk/res/mipmap-mdpi/ic_launcher.png diff --git a/apk/demo/res/mipmap-xhdpi/ic_launcher.png b/sdk/example/demo_launcher/apk/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from apk/demo/res/mipmap-xhdpi/ic_launcher.png rename to sdk/example/demo_launcher/apk/res/mipmap-xhdpi/ic_launcher.png diff --git a/apk/demo/res/mipmap-xxhdpi/ic_launcher.png b/sdk/example/demo_launcher/apk/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from apk/demo/res/mipmap-xxhdpi/ic_launcher.png rename to sdk/example/demo_launcher/apk/res/mipmap-xxhdpi/ic_launcher.png diff --git a/apk/demo/res/mipmap-xxxhdpi/ic_launcher.png b/sdk/example/demo_launcher/apk/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from apk/demo/res/mipmap-xxxhdpi/ic_launcher.png rename to sdk/example/demo_launcher/apk/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/sdk/example/mine_digger/BUILD.gn b/sdk/example/mine_digger/BUILD.gn index 2af4e13fe491aba0e50c82eb56a04ac85440945f..3472599a817da312785f278112ea7b46fecc6417 100644 --- a/sdk/example/mine_digger/BUILD.gn +++ b/sdk/example/mine_digger/BUILD.gn @@ -4,7 +4,7 @@ assert(is_android) -import("//sky/apk/rules.gni") +import("//sky/build/sky_app.gni") sky_app("mine_digger") { apk_name = "MineDigger" diff --git a/sdk/example/stocks/BUILD.gn b/sdk/example/stocks/BUILD.gn index 0173673ef4912182d386bf0eb288c02979188769..0e56d1536f47e92d53b88cb4d22dff7373dbe5ff 100644 --- a/sdk/example/stocks/BUILD.gn +++ b/sdk/example/stocks/BUILD.gn @@ -4,7 +4,7 @@ assert(is_android) -import("//sky/apk/rules.gni") +import("//sky/build/sky_app.gni") sky_app("stocks") { apk_name = "Stocks"