firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move //third_party/android_embedding_dependencies to //flutter/third_party. (flutter/engine#53587)

Browse Source 
... as part of the buildmoot effort.

I'll rebase after @gmackall's definitely-will-work-this-time bump of the dependencies.
This commit is contained in:
Matan Lurey 2024-07-03 11:40:23 -07:00 committed by GitHub
parent 68ae17c64b
commit ee6b0f1b2d
7 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -781,7 +781,7 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'src/third_party/android_embedding_dependencies': { 'src/flutter/third_party/android_embedding_dependencies': {
'packages': [ 'packages': [
{ {
'package': 'flutter/android/embedding_bundle', 'package': 'flutter/android/embedding_bundle',

1
engine/src/flutter/ci/licenses_golden/excluded_files
View File

@ -783,6 +783,7 @@
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc ../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc ../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
../../../flutter/third_party/accessibility/gfx/test ../../../flutter/third_party/accessibility/gfx/test
../../../flutter/third_party/android_embedding_dependencies
../../../flutter/third_party/android_tools ../../../flutter/third_party/android_tools
../../../flutter/third_party/angle/.clang-format ../../../flutter/third_party/angle/.clang-format
../../../flutter/third_party/angle/.git ../../../flutter/third_party/angle/.git

2
engine/src/flutter/ci/licenses_golden/tool_signature
View File

@ -1,2 +1,2 @@
Signature: 2670e7ab781a8bc009ac069d3b7d9cb5 Signature: ab7d947173008367f25140349a15810a

62
engine/src/flutter/shell/platform/android/BUILD.gn
View File

@ -353,37 +353,37 @@ android_java_sources = [
] ]
embedding_dependencies_jars = [ embedding_dependencies_jars = [
"//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
"//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
"//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
"//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
"//third_party/android_embedding_dependencies/lib/core-1.13.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
"//third_party/android_embedding_dependencies/lib/core-1.10.3.jar", "//flutter/third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
"//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar", "//flutter/third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
"//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar", "//flutter/third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
] ]
action("check_imports") { action("check_imports") {

2
engine/src/flutter/shell/platform/android/build.gradle
View File

@ -46,7 +46,7 @@ android {
} }
dependencies { 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 // These dependencies should be kept in line with those in the ./test_runner/build.gradle
implementation "androidx.test:core:1.4.0" implementation "androidx.test:core:1.4.0"

4
engine/src/flutter/tools/javadoc/gen_javadoc.py
View File

@ -60,7 +60,9 @@ def main():
classpath = [ classpath = [
args.android_source_root, args.android_source_root,
android_jar_path, 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: if args.build_config_path:
classpath.append(args.build_config_path) classpath.append(args.build_config_path)

2
engine/src/flutter/tools/licenses/lib/paths.dart
View File

@ -31,6 +31,7 @@ final Set<String> skippedPaths = <String>{
r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
r'flutter/prebuilts', r'flutter/prebuilts',
r'flutter/sky/packages/sky_engine/LICENSE', 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/android_tools', // excluded on advice
r'flutter/third_party/angle/android', r'flutter/third_party/angle/android',
r'flutter/third_party/angle/doc', r'flutter/third_party/angle/doc',
@ -220,7 +221,6 @@ final Set<String> skippedPaths = <String>{
r'fuchsia/sdk/mac/NOTICE.fuchsia', r'fuchsia/sdk/mac/NOTICE.fuchsia',
r'fuchsia/sdk/mac/tools', r'fuchsia/sdk/mac/tools',
r'out', // output of build 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/android_tools', // excluded on advice
r'third_party/java', // only used for Android builds r'third_party/java', // only used for Android builds
r'third_party/libxml', // dependency of the testing system that we don't actually use r'third_party/libxml', // dependency of the testing system that we don't actually use