Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7f72aeb

Browse files
authored
Move //third_party/android_embedding_dependencies to //flutter/third_party. (#53587)
... as part of the buildmoot effort. I'll rebase after @gmackall's definitely-will-work-this-time bump of the dependencies.
1 parent fb57f3b commit 7f72aeb

File tree

7 files changed

+39
-36
lines changed

7 files changed

+39
-36
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ deps = {
781781
'dep_type': 'cipd',
782782
},
783783

784-
'src/third_party/android_embedding_dependencies': {
784+
'src/flutter/third_party/android_embedding_dependencies': {
785785
'packages': [
786786
{
787787
'package': 'flutter/android/embedding_bundle',

ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@
783783
../../../flutter/third_party/accessibility/gfx/geometry/vector2d_unittest.cc
784784
../../../flutter/third_party/accessibility/gfx/range/range_unittest.cc
785785
../../../flutter/third_party/accessibility/gfx/test
786+
../../../flutter/third_party/android_embedding_dependencies
786787
../../../flutter/third_party/android_tools
787788
../../../flutter/third_party/angle/.clang-format
788789
../../../flutter/third_party/angle/.git

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 2670e7ab781a8bc009ac069d3b7d9cb5
1+
Signature: ab7d947173008367f25140349a15810a
22

shell/platform/android/BUILD.gn

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -353,37 +353,37 @@ android_java_sources = [
353353
]
354354

355355
embedding_dependencies_jars = [
356-
"//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
357-
"//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
358-
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
359-
"//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
360-
"//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
361-
"//third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
362-
"//third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
363-
"//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
364-
"//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
365-
"//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
366-
"//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
367-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
368-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
369-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
370-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
371-
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
372-
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
373-
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
374-
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
375-
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
376-
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
377-
"//third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
378-
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
379-
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
380-
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
381-
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
382-
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
383-
"//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
384-
"//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
385-
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
386-
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
356+
"//flutter/third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
357+
"//flutter/third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
358+
"//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
359+
"//flutter/third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
360+
"//flutter/third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
361+
"//flutter/third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
362+
"//flutter/third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
363+
"//flutter/third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
364+
"//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
365+
"//flutter/third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
366+
"//flutter/third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
367+
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
368+
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
369+
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
370+
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
371+
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
372+
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
373+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
374+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
375+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
376+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
377+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
378+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
379+
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
380+
"//flutter/third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
381+
"//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
382+
"//flutter/third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
383+
"//flutter/third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
384+
"//flutter/third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
385+
"//flutter/third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
386+
"//flutter/third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
387387
]
388388

389389
action("check_imports") {

shell/platform/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646
}
4747

4848
dependencies {
49-
implementation fileTree(include: ["*.jar"], dir: "../../../../third_party/android_embedding_dependencies/lib/")
49+
implementation fileTree(include: ["*.jar"], dir: "../../../../flutter/third_party/android_embedding_dependencies/lib/")
5050

5151
// These dependencies should be kept in line with those in the ./test_runner/build.gradle
5252
implementation "androidx.test:core:1.4.0"

tools/javadoc/gen_javadoc.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ def main():
6060
classpath = [
6161
args.android_source_root,
6262
android_jar_path,
63-
os.path.join(args.src_dir, 'third_party', 'android_embedding_dependencies', 'lib', '*'),
63+
os.path.join(
64+
args.src_dir, 'flutter', 'third_party', 'android_embedding_dependencies', 'lib', '*'
65+
),
6466
]
6567
if args.build_config_path:
6668
classpath.append(args.build_config_path)

tools/licenses/lib/paths.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ final Set<String> skippedPaths = <String>{
3131
r'flutter/lib/web_ui/dev', // these are build tools; they do not end up in Engine artifacts
3232
r'flutter/prebuilts',
3333
r'flutter/sky/packages/sky_engine/LICENSE',
34+
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
3435
r'flutter/third_party/android_tools', // excluded on advice
3536
r'flutter/third_party/angle/android',
3637
r'flutter/third_party/angle/doc',
@@ -220,7 +221,6 @@ final Set<String> skippedPaths = <String>{
220221
r'fuchsia/sdk/mac/NOTICE.fuchsia',
221222
r'fuchsia/sdk/mac/tools',
222223
r'out', // output of build
223-
r'third_party/android_embedding_dependencies', // Not shipped. Used only for the build-time classpath, and for the in-tree testing framework for Android
224224
r'third_party/android_tools', // excluded on advice
225225
r'third_party/java', // only used for Android builds
226226
r'third_party/libxml', // dependency of the testing system that we don't actually use

0 commit comments

Comments
 (0)