From fffbbe787fddc3aaf59cdc975ee6a1625d18d135 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 26 Jun 2024 10:52:37 -0700 Subject: [PATCH 1/4] Move //third_party/android_embedding_dependencies to //flutter/third_party. --- DEPS | 2 +- shell/platform/android/BUILD.gn | 62 ++++++++++++++--------------- shell/platform/android/build.gradle | 2 +- tools/javadoc/gen_javadoc.py | 2 +- tools/licenses/lib/paths.dart | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/DEPS b/DEPS index 55f75ea2ca115..a3c364d371f2d 100644 --- a/DEPS +++ b/DEPS @@ -781,7 +781,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/android_embedding_dependencies': { + 'src/flutter/third_party/android_embedding_dependencies': { 'packages': [ { 'package': 'flutter/android/embedding_bundle', diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 40e6912ec335f..49f44aa994b61 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -353,37 +353,37 @@ android_java_sources = [ ] embedding_dependencies_jars = [ - "//third_party/android_embedding_dependencies/lib/activity-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar", - "//third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar", - "//third_party/android_embedding_dependencies/lib/annotations-13.0.jar", - "//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar", - "//third_party/android_embedding_dependencies/lib/core-1.6.0.jar", - "//third_party/android_embedding_dependencies/lib/core-1.8.0.jar", - "//third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar", - "//third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar", - "//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar", - "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar", - "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar", - "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar", - "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar", - "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar", - "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-process-2.2.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar", - "//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar", - "//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar", - "//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar", - "//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar", - "//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar", + "//flutter/third_party/android_embedding_dependencies/lib/activity-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/annotations-13.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/collection-1.1.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/core-1.6.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/core-1.8.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/customview-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar", + "//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.2.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/loader-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar", + "//flutter/third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar", + "//flutter/third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar", + "//flutter/third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar", ] action("check_imports") { diff --git a/shell/platform/android/build.gradle b/shell/platform/android/build.gradle index 5d8bded77f378..72977e7ef31a1 100644 --- a/shell/platform/android/build.gradle +++ b/shell/platform/android/build.gradle @@ -46,7 +46,7 @@ android { } dependencies { - implementation fileTree(include: ["*.jar"], dir: "../../../../third_party/android_embedding_dependencies/lib/") + implementation fileTree(include: ["*.jar"], dir: "../../../../flutter/third_party/android_embedding_dependencies/lib/") // These dependencies should be kept in line with those in the ./test_runner/build.gradle implementation "androidx.test:core:1.4.0" diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index cd30594215a28..ecb87fd1ab7d2 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -60,7 +60,7 @@ def main(): classpath = [ args.android_source_root, android_jar_path, - os.path.join(args.src_dir, 'third_party', 'android_embedding_dependencies', 'lib', '*'), + os.path.join(args.src_dir, 'flutter', 'third_party', 'android_embedding_dependencies', 'lib', '*'), ] if args.build_config_path: classpath.append(args.build_config_path) diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart index c37c01bdc7ce9..4587117289ab7 100644 --- a/tools/licenses/lib/paths.dart +++ b/tools/licenses/lib/paths.dart @@ -31,6 +31,7 @@ final Set skippedPaths = { r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts r'flutter/prebuilts', r'flutter/sky/packages/sky_engine/LICENSE', + r'flutter/third_party/android_embedding_dependencies', // Not shipped. Used only for the build-time classpath, and for the in-tree testing framework for Android r'flutter/third_party/android_tools', // excluded on advice r'flutter/third_party/angle/android', r'flutter/third_party/angle/doc', @@ -219,7 +220,6 @@ final Set skippedPaths = { r'fuchsia/sdk/mac/NOTICE.fuchsia', r'fuchsia/sdk/mac/tools', r'out', // output of build - r'third_party/android_embedding_dependencies', // Not shipped. Used only for the build-time classpath, and for the in-tree testing framework for Android r'third_party/android_tools', // excluded on advice r'third_party/java', // only used for Android builds r'third_party/libxml', // dependency of the testing system that we don't actually use From da169b6bb5cfc846bb546e2e677881ad1bf8627a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 26 Jun 2024 10:53:00 -0700 Subject: [PATCH 2/4] ++ --- tools/javadoc/gen_javadoc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index ecb87fd1ab7d2..f09ce1291f282 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -60,7 +60,9 @@ def main(): classpath = [ args.android_source_root, android_jar_path, - os.path.join(args.src_dir, 'flutter', 'third_party', 'android_embedding_dependencies', 'lib', '*'), + os.path.join( + args.src_dir, 'flutter', 'third_party', 'android_embedding_dependencies', 'lib', '*' + ), ] if args.build_config_path: classpath.append(args.build_config_path) From 1cfe31fc3e517820119d7240aec9869640c711a5 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Mon, 1 Jul 2024 16:04:47 -0700 Subject: [PATCH 3/4] ++ --- ci/licenses_golden/excluded_files | 1 + ci/licenses_golden/tool_signature | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index bec99eef744ad..69ff59dfaa049 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -782,6 +782,7 @@ ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc ../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc ../../../flutter/third_party/accessibility/gfx/test +../../../flutter/third_party/android_embedding_dependencies ../../../flutter/third_party/android_tools ../../../flutter/third_party/angle/.clang-format ../../../flutter/third_party/angle/.git diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 718ca28d0b2a4..37b37a2561f2a 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 8fcfb02b766e80ce50611b894f3fe047 +Signature: afe85adc31aaa4ad26d438fe362c232e From e4e2709b8eb098d188c0696cbcb98152d10d0d5b Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Wed, 3 Jul 2024 10:52:31 -0700 Subject: [PATCH 4/4] ++ --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 37b37a2561f2a..5e9813688d52d 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: afe85adc31aaa4ad26d438fe362c232e +Signature: ab7d947173008367f25140349a15810a