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

Move //third_party/android_embedding_dependencies to //flutter/third_party. #53587

Merged
merged 7 commits into from
Jul 3, 2024
Merged

Move //third_party/android_embedding_dependencies to //flutter/third_party. #53587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fffbbe7
Move //third_party/android_embedding_dependencies to //flutter/third_…
matanlurey Jun 26, 2024
da169b6
++
matanlurey Jun 26, 2024
516bdf7
Merge remote-tracking branch 'upstream/main' into buildmoot-android-e…
matanlurey Jun 29, 2024
1cfe31f
++
matanlurey Jul 1, 2024
6309bde
++
matanlurey Jul 1, 2024
fe4f12d
Merge remote-tracking branch 'upstream/main' into buildmoot-android-e…
matanlurey Jul 3, 2024
e4e2709
++
matanlurey Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions ci/licenses_golden/excluded_files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,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
Expand Down
2 changes: 1 addition & 1 deletion ci/licenses_golden/tool_signature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Signature: 2670e7ab781a8bc009ac069d3b7d9cb5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non blocking where does this hash come from?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, CI tells me about it

Signature: ab7d947173008367f25140349a15810a

62 changes: 31 additions & 31 deletions shell/platform/android/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,37 +353,37 @@ android_java_sources = [
]

embedding_dependencies_jars = [
"//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
"//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
"//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
"//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
"//third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
"//third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
"//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
"//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",
"//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",
"//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",
"//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",
"//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",
"//third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.2.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.2.0.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/tracing-1.2.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.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
]

action("check_imports") {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion tools/javadoc/gen_javadoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ 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)
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/lib/paths.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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',
Expand Down Expand Up @@ -220,7 +221,6 @@ final Set<String> skippedPaths = <String>{
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why could this be removed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as opposed to relocated

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
Expand Down