diff options
author | Aurimas Liutikas <aurimas@google.com> | 2022-05-09 22:59:10 +0000 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2022-05-09 23:12:33 +0000 |
commit | e520ecdb5d7b8ffce209a490f2bae5e44245cd77 (patch) | |
tree | 2ebb0090f4123180cd357b7ae73b745acb7f8d3b | |
parent | da86bf44a7df333a1396df84767cde9282bc41c5 (diff) | |
download | manifest-e520ecdb5d7b8ffce209a490f2bae5e44245cd77.tar.gz |
Move to using androidx-main for fullsdk-* projects
Bug: 229911554
Change-Id: Ia039457321c1764246db72bf48e674a856885469
Test: presubmit
-rw-r--r-- | default.xml | 103 |
1 files changed, 46 insertions, 57 deletions
diff --git a/default.xml b/default.xml index ea8796caa..cf46f25e5 100644 --- a/default.xml +++ b/default.xml @@ -47,89 +47,92 @@ <!-- Config: shallow + same revision --> <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" /> - <!-- SDK dependencies (shared) --> - <!-- Config: shallow + master revision --> + <!-- SDK dependencies --> + <!-- Config: shallow + same revision --> <project path="prebuilts/fullsdk-darwin/platforms/android-31" name="platform/prebuilts/fullsdk/platforms/android-31" - revision="master" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-31" /> </project> <project path="prebuilts/fullsdk-darwin/sources/android-31" name="platform/prebuilts/fullsdk/sources/android-31" - revision="master" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-31" /> </project> <project path="prebuilts/fullsdk-darwin/platforms/android-32" name="platform/prebuilts/fullsdk/platforms/android-32" - revision="androidx-main" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-32" /> </project> <project path="prebuilts/fullsdk-darwin/sources/android-32" name="platform/prebuilts/fullsdk/sources/android-32" - revision="androidx-main" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-32" /> </project> <project path="prebuilts/fullsdk-darwin/platforms/android-33" name="platform/prebuilts/fullsdk/platforms/android-33" - revision="master" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-33" /> </project> <project path="prebuilts/fullsdk-darwin/sources/android-33" name="platform/prebuilts/fullsdk/sources/android-33" - revision="master" clone-depth="1"> <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-33" /> </project> - <project - path="prebuilts/jdk/jdk11" - name="platform/prebuilts/jdk/jdk11" - revision="master" - clone-depth="1" /> - <!-- Config: shallow + same revision --> - <!-- This branch of JDK 8 contains only the tools JAR required for Compose tests and Doclava. --> - <project - path="prebuilts/jdk/jdk8" - name="platform/prebuilts/jdk/jdk8" - clone-depth="1" /> - <!-- SDK dependencies (darwin) --> - <!-- Config: shallow + master revision --> + <!-- darwin specific --> <project path="prebuilts/fullsdk-darwin/build-tools" name="platform/prebuilts/fullsdk-darwin/build-tools" - revision="master" - clone-depth="1" - groups="notdefault,platform-darwin" /> - <project - path="prebuilts/fullsdk-darwin/ndk-bundle" - name="toolchain/prebuilts/ndk-darwin/r23" - revision="master" clone-depth="1" groups="notdefault,platform-darwin" /> <project path="prebuilts/fullsdk-darwin/platform-tools" name="platform/prebuilts/fullsdk-darwin/platform-tools" - revision="master" clone-depth="1" groups="notdefault,platform-darwin" /> <project path="prebuilts/fullsdk-darwin/tools" name="platform/prebuilts/fullsdk-darwin/tools" + clone-depth="1" + groups="notdefault,platform-darwin" /> + + <!-- linux specific --> + <project + path="prebuilts/fullsdk-linux/build-tools" + name="platform/prebuilts/fullsdk-linux/build-tools" + clone-depth="1" + groups="notdefault,platform-linux" /> + <project + path="prebuilts/fullsdk-linux/platform-tools" + name="platform/prebuilts/fullsdk-linux/platform-tools" + clone-depth="1" + groups="notdefault,platform-linux" /> + <project + path="prebuilts/fullsdk-linux/tools" + name="platform/prebuilts/fullsdk-linux/tools" + clone-depth="1" + groups="notdefault,platform-linux" /> + <project + path="prebuilts/build-tools" + name="platform/prebuilts/build-tools" + groups="notdefault,platform-linux" + clone-depth="1" /> + + <!-- NDK dependencies --> + <!-- Config: shallow + master revision --> + <project + path="prebuilts/fullsdk-darwin/ndk-bundle" + name="toolchain/prebuilts/ndk-darwin/r23" revision="master" clone-depth="1" groups="notdefault,platform-darwin" /> - <!-- Config: shallow + explicit revision --> <project path="prebuilts/fullsdk-darwin/cmake" name="platform/prebuilts/cmake/darwin-x86" @@ -146,15 +149,6 @@ clone-depth="1" > <linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" /> </project> - - <!-- SDK dependencies (linux) --> - <!-- Config: shallow + master revision --> - <project - path="prebuilts/fullsdk-linux/build-tools" - name="platform/prebuilts/fullsdk-linux/build-tools" - revision="master" - clone-depth="1" - groups="notdefault,platform-linux" /> <project path="prebuilts/fullsdk-linux/ndk-bundle" name="toolchain/prebuilts/ndk/r23" @@ -162,19 +156,6 @@ clone-depth="1" groups="notdefault,platform-linux" /> <project - path="prebuilts/fullsdk-linux/platform-tools" - name="platform/prebuilts/fullsdk-linux/platform-tools" - revision="master" - clone-depth="1" - groups="notdefault,platform-linux" /> - <project - path="prebuilts/fullsdk-linux/tools" - name="platform/prebuilts/fullsdk-linux/tools" - revision="master" - clone-depth="1" - groups="notdefault,platform-linux" /> - <!-- Config: shallow + explicit revision --> - <project path="prebuilts/fullsdk-linux/cmake" name="platform/prebuilts/cmake/linux-x86" revision="master" @@ -196,13 +177,21 @@ revision="master" groups="notdefault,platform-linux" clone-depth="1" /> + + <!-- JDK dependencies --> + <!-- Config: shallow + master revision --> <project - path="prebuilts/build-tools" - name="platform/prebuilts/build-tools" - revision="androidx-main" - groups="notdefault,platform-linux" + path="prebuilts/jdk/jdk11" + name="platform/prebuilts/jdk/jdk11" + revision="master" clone-depth="1" /> - + <!-- This branch of JDK 8 contains only the tools JAR required for Compose tests and Doclava. --> + <!-- Config: shallow + same revision --> + <project + path="prebuilts/jdk/jdk8" + name="platform/prebuilts/jdk/jdk8" + clone-depth="1" /> + <!-- Golden images --> <project path="golden" name="platform/frameworks/support-golden" clone-depth="1" /> |