Move //third_party/java to //flutter/third_party/java (flutter/engine#53590)

... as part of buildmoot.

DEPS

@@ -792,7 +792,7 @@ deps = {
      'dep_type': 'cipd',
    },
 
-  'src/third_party/java/openjdk': {
+  'src/flutter/third_party/java/openjdk': {
      'packages': [
        {
         'package': 'flutter/java/openjdk/${{platform}}',

engine/src/flutter/ci/licenses_golden/excluded_files

@@ -2076,6 +2076,7 @@
 ../../../flutter/third_party/inja/test
 ../../../flutter/third_party/inja/third_party/amalgamate
 ../../../flutter/third_party/inja/third_party/include/doctest
+../../../flutter/third_party/java
 ../../../flutter/third_party/json/.clang-format
 ../../../flutter/third_party/json/.clang-tidy
 ../../../flutter/third_party/json/.git
@@ -3572,5 +3573,4 @@
 ../../../fuchsia/sdk/linux/tools
 ../../../fuchsia/sdk/linux/version_history.json
 ../../../out
-../../../third_party
 ../../../tools

engine/src/flutter/ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: ab7d947173008367f25140349a15810a
+Signature: 20cf9943c0d497ff413da0c272ee0b96
 

engine/src/flutter/shell/platform/android/BUILD.gn

@@ -441,15 +441,16 @@ action("flutter_shell_java") {
       ] + rebase_path(embedding_dependencies_jars, root_build_dir)
 
   if (host_os == "mac") {
-    _javacbin =
+    _javacbin = rebase_path(
-        rebase_path("//third_party/java/openjdk/Contents/Home/bin/javac")
+            "//flutter/third_party/java/openjdk/Contents/Home/bin/javac")
-    _jarbin = rebase_path("//third_party/java/openjdk/Contents/Home/bin/jar")
+    _jarbin =
+        rebase_path("//flutter/third_party/java/openjdk/Contents/Home/bin/jar")
   } else if (host_os == "win") {
-    _javacbin = rebase_path("//third_party/java/openjdk/bin/javac.exe")
+    _javacbin = rebase_path("//flutter/third_party/java/openjdk/bin/javac.exe")
-    _jarbin = rebase_path("//third_party/java/openjdk/bin/jar.exe")
+    _jarbin = rebase_path("//flutter/third_party/java/openjdk/bin/jar.exe")
   } else {
-    _javacbin = rebase_path("//third_party/java/openjdk/bin/javac")
+    _javacbin = rebase_path("//flutter/third_party/java/openjdk/bin/javac")
-    _jarbin = rebase_path("//third_party/java/openjdk/bin/jar")
+    _jarbin = rebase_path("//flutter/third_party/java/openjdk/bin/jar")
   }
 
   args = [

engine/src/flutter/testing/android/native_activity/native_activity_apk.py

@@ -26,9 +26,9 @@ def java_home():
   script_path = os.path.dirname(os.path.realpath(__file__))
   if is_mac():
     return os.path.join(
-        script_path, '..', '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
+        script_path, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
     )
-  return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk')
+  return os.path.join(script_path, '..', 'third_party', 'java', 'openjdk')
 
 
 def java_bin():

engine/src/flutter/testing/rules/run_gradle.py

@@ -26,13 +26,11 @@ ANDROID_HOME = os.path.normpath(
 
 if platform.system() == 'Darwin':
   JAVA_HOME = os.path.normpath(
-      os.path.join(
+      os.path.join(SCRIPT_PATH, '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home')
-          SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
-      )
   )
 else:
   JAVA_HOME = os.path.normpath(
-      os.path.join(SCRIPT_PATH, '..', '..', '..', 'third_party', 'java', 'openjdk')
+      os.path.join(SCRIPT_PATH, '..', '..', 'third_party', 'java', 'openjdk')
   )
 
 

engine/src/flutter/testing/run_tests.py

@@ -691,10 +691,8 @@ def assert_expected_xcode_version():
 def java_home():
   script_path = os.path.dirname(os.path.realpath(__file__))
   if is_mac():
-    return os.path.join(
+    return os.path.join(script_path, '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home')
-        script_path, '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home'
+  return os.path.join(script_path, '..', 'third_party', 'java', 'openjdk')
-    )
-  return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk')
 
 
 def java_bin():

engine/src/flutter/tools/android_lint/bin/main.dart

@@ -166,9 +166,9 @@ ArgParser setupOptions() {
 
 String getJavaHome(String src) {
   if (Platform.isMacOS) {
-    return path.normalize('$src/third_party/java/openjdk/Contents/Home/');
+    return path.normalize('$src/flutter/third_party/java/openjdk/Contents/Home/');
   }
-  return path.normalize('$src/third_party/java/openjdk/');
+  return path.normalize('$src/flutter/third_party/java/openjdk/');
 }
 
 /// The root directory of this project.

engine/src/flutter/tools/javadoc/gen_javadoc.py

@@ -17,17 +17,15 @@ SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 def JavadocBin():
   if sys.platform == 'darwin':
     return os.path.join(
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home', 'bin',
+        SCRIPT_DIR, '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home', 'bin',
         'javadoc'
     )
   elif sys.platform.startswith(('cygwin', 'win')):
     return os.path.join(
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc.exe'
+        SCRIPT_DIR, '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc.exe'
     )
   else:
-    return os.path.join(
+    return os.path.join(SCRIPT_DIR, '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc')
-        SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc'
-    )
 
 
 def main():

engine/src/flutter/tools/licenses/lib/paths.dart

@@ -105,6 +105,7 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/inja/doc', // documentation
   r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
   r'flutter/third_party/inja/third_party/include/doctest', // seems to be a unit test library
+  r'flutter/third_party/java', // only used for Android builds
   r'flutter/third_party/json/docs',
   r'flutter/third_party/libcxx/benchmarks',
   r'flutter/third_party/libcxx/docs',
@@ -222,7 +223,6 @@ final Set<String> skippedPaths = <String>{
   r'fuchsia/sdk/mac/tools',
   r'out', // output of build
   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
   r'tools', // not distributed in binary
 };