summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2023-10-06 09:51:57 -0700
committerErwin Jansen <jansene@google.com>2023-10-06 10:34:35 -0700
commitf37768fce097291b5f5d07408cb0b44d45cf7ede (patch)
tree593ba397b2e2346e53b1773b9b0de986c080ee4c
parent92f492d5d39043cf81d02be4a988ab075b5a3d00 (diff)
downloadmanifest-f37768fce097291b5f5d07408cb0b44d45cf7ede.tar.gz
Make the Java JDK available
The E2E integration tests require us to: - build APK's using gradle - run sdkmanager to make sure we have all dependencies This will enable us to use the proper JDK without having to pre-install the required JDK. Bug: 302605853 Change-Id: I7f9db9a6d09af5bae1f70abf46fb72ccc074613a
-rw-r--r--default.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/default.xml b/default.xml
index 1e655d8f7..fae41672e 100644
--- a/default.xml
+++ b/default.xml
@@ -23,7 +23,7 @@
<project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" revision="main"/>
<project path="device/generic/vulkan-cereal" name="device/generic/vulkan-cereal" revision="main"/>
<project path="external/adt-infra" name="platform/external/adt-infra" />
- <project path="external/mobly-bundled-snippets" name="platform/external/mobly-bundled-snippets" revision="main" />
+ <project path="external/mobly-bundled-snippets" name="platform/external/mobly-bundled-snippets" revision="main" />
<project path="external/angle" name="platform/external/angle" />
<project path="external/astc-codec" name="platform/external/astc-codec" revision="main" />
<project path="external/boringssl" name="platform/external/boringssl" revision="main" clone-depth="1"/>
@@ -85,6 +85,9 @@
<project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" clone-depth="1" revision="main" groups="notdefault,platform-darwin" />
<project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" revision="llvm-toolchain" groups="notdefault,platform-darwin" />
+ <!-- Java JDK, we will use the one maintained by android studio -->
+ <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk" clone-depth="1" revision="studio-main"/>
+
<!-- Tink security library and dependencies -->
<project path="external/tink" name="platform/external/tink" />
<project path="external/rapidjson" name="platform/external/rapidjson" revision="main"/>