From 39fe210b412363c9fdaa71dfd6b858cc80ac2317 Mon Sep 17 00:00:00 2001 From: Xilai Zhang Date: Mon, 28 Nov 2022 16:04:17 -0800 Subject: [PATCH 1/2] add top level metadata for androids --- shell/platform/android/BUILD.gn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index d59de0d939715..91d625072f4b7 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -592,6 +592,14 @@ zip_bundle("android_javadoc") { deps = [ ":gen_android_javadoc" ] } +generated_file("android_entitlement_config") { + outputs = [ "$target_gen_dir/android_entitlements.txt" ] + contents = [ + "gen_snapshot" + ] + deps = [] +} + if (target_cpu != "x86") { zip_bundle("gen_snapshot") { gen_snapshot_bin = "gen_snapshot" @@ -647,6 +655,14 @@ if (target_cpu != "x86") { ] deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ] + + if(host_os == "mac"){ + deps += [":android_entitlement_config"] + files += [{ + source = "$target_gen_dir/android_entitlements.txt" + destination = "entitlements.txt" + },] + } } } From 1b243da71e0bfa9a32e1cb6bb9d39779f609bc7a Mon Sep 17 00:00:00 2001 From: Xilai Zhang Date: Mon, 28 Nov 2022 16:05:33 -0800 Subject: [PATCH 2/2] add top level metadata for androids --- shell/platform/android/BUILD.gn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 91d625072f4b7..2da0fe0e893f3 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -594,9 +594,7 @@ zip_bundle("android_javadoc") { generated_file("android_entitlement_config") { outputs = [ "$target_gen_dir/android_entitlements.txt" ] - contents = [ - "gen_snapshot" - ] + contents = [ "gen_snapshot" ] deps = [] } @@ -656,12 +654,14 @@ if (target_cpu != "x86") { deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ] - if(host_os == "mac"){ - deps += [":android_entitlement_config"] - files += [{ - source = "$target_gen_dir/android_entitlements.txt" - destination = "entitlements.txt" - },] + if (host_os == "mac") { + deps += [ ":android_entitlement_config" ] + files += [ + { + source = "$target_gen_dir/android_entitlements.txt" + destination = "entitlements.txt" + }, + ] } } }