Add the jdk dep when building standalone for Android.

.gitignore

@@ -39,6 +39,8 @@
 /third_party/gles1_conform
 /third_party/glmark2/src
 /third_party/googletest
+/third_party/jdk/current
+/third_party/jdk/extras/java_8
 /third_party/jsoncpp
 /third_party/libjpeg_turbo
 /third_party/libpng/src

DEPS

@@ -203,6 +203,28 @@ deps = {
     'condition': 'not build_with_chromium',
   },
 
+  'third_party/jdk': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/jdk',
+              'version': 'JhpgSvTpgVUkoKe56yQmYaR1jXNcY8NqlltA0mKIO4EC',
+          },
+      ],
+      'condition': 'checkout_android and not build_with_chromium',
+      'dep_type': 'cipd',
+  },
+
+  'third_party/jdk/extras': {
+      'packages': [
+          {
+              'package': 'chromium/third_party/jdk/extras',
+              'version': '-7m_pvgICYN60yQI3qmTj_8iKjtnT4NXicT0G_jJPqsC',
+          },
+      ],
+      'condition': 'checkout_android and not build_with_chromium',
+      'dep_type': 'cipd',
+  },
+
   'third_party/jsoncpp': {
     'url': '{chromium_git}/chromium/src/third_party/jsoncpp@{chromium_jsoncpp_revision}',
     'condition': 'not build_with_chromium',

scripts/roll_chromium_deps.py

@@ -43,6 +43,8 @@ ANGLE_CHROMIUM_DEPS = [
     'third_party/abseil-cpp',
     'third_party/catapult',
     'third_party/depot_tools',
+    'third_party/jdk',
+    'third_party/jdk/extras',
     'third_party/libjpeg_turbo',
     'third_party/nasm',
     'third_party/protobuf',

third_party/jdk/3pp/3pp.pb

+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+create {
+  source {
+    url {
+      # See the link "[Binaries]" in
+      # https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u#JDK11u-Releases
+      download_url: "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_11.0.4_11.tar.gz"
+      version: "11.0.4+11"
+    }
+    patch_version: 'cr0'
+    unpack_archive: true
+    subdir: 'current'
+  }
+}
+
+upload {
+  pkg_prefix: "chromium/third_party"
+  universal: true
+}

third_party/jdk/BUILD.gn

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("java_data") {
+  data = [
+    "current/bin/java",
+    "current/conf/",
+    "current/jmods/",
+    "current/lib/",
+  ]
+}

third_party/jdk/OWNERS

+agrieve@chromium.org
+wnwen@chromium.org
+yliuyliu@google.com

third_party/jdk/README.chromium

+Name: Java Development Kit
+Short Name: JDK
+URL: https://openjdk.java.net/
+Version: 11.0.4
+CPEPrefix: cpe:/a:oracle:openjdk:11.0.4
+License: GPL v2
+License File: NOT_SHIPPED
+Security Critical: no
+
+Description:
+The Java Development Kit (JDK) is a software development environment used for
+developing Java applications and applets. (linux-x64)
+
+How to update:
+For the `jdk` directory:
+1. Find the specific version you want to update from
+   https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u#JDK11u-Releases
+2. Click the link "[Binaries]" for the specific version.
+3. Copy the link address of the asset "OpenJDK11U-jre_x64_linux_<specific_version>.tar.gz"
+4. Update the "download_url" and "version" in 3pp/3pp.pb with the desired values.
+5. Upload and land the CL.
+6. Wait for the 3pp packager (https://ci.chromium.org/p/chromium/builders/ci/3pp-linux-amd64-packager)
+   to create the new instance at https://chrome-infra-packages.appspot.com/p/chromium/third_party/jdk/+/
+7. Update instance ID in //DEPS
+
+For the `jdk/extras` subdirectory:
+1. Find the specific version you want to update from
+   https://wiki.openjdk.java.net/display/jdk8u#Main-Releases
+2. Click the link "[Binaries]" for the specific version.
+3. Copy the link address of the asset "OpenJDK8U-jdk_x64_linux_<specific_version>.tar.gz"
+4. Update the "download_url" and "version" in 3pp/3pp.pb with the desired values.
+5. Upload and land the CL.
+6. Wait for the 3pp packager (https://ci.chromium.org/p/chromium/builders/ci/3pp-linux-amd64-packager)
+   to create the new instance at https://chrome-infra-packages.appspot.com/p/chromium/third_party/jdk/extras/+/
+7. Update instance ID in //DEPS
+
+Local Modifications:
+None
+
+This directory is copied from Chromium's third_party/jdk for standalone ANGLE builds.

third_party/jdk/extras/3pp/3pp.pb

+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+create {
+  source {
+    url {
+      # See the link "[Binaries]" in
+      # https://wiki.openjdk.java.net/display/jdk8u#Main-Releases
+      download_url: "https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_8u275b01.tar.gz"
+      version: "8u275-b01"
+    }
+    patch_version: 'cr0'
+    unpack_archive: true
+  }
+  build {}
+}
+
+upload {
+  pkg_prefix: "chromium/third_party/jdk"
+  universal: true
+}

third_party/jdk/extras/3pp/install.sh

+#!/bin/bash
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+set -x
+set -o pipefail
+
+PREFIX="$1"
+SUB_DIR="java_8/jre/lib"
+
+# Prepare the directory
+mkdir -p "$PREFIX/$SUB_DIR"
+# Copy the rt.jar file to $SUB_DIR
+cp ./jre/lib/rt.jar "$PREFIX/$SUB_DIR"