Compare commits

...

14 Commits

Author SHA1 Message Date
android-build-prod (mdb)
5c01799952 DO NOT MERGE ANYWHERE Create manifest for androidx-xr-projected-release
BUG: 450323687
Change-Id: I3b6d4239dcfb11cc048b485d67a5a51b60a08fdf
2025-10-08 21:43:38 -07:00
Barış Kaya
62d757ab52 Add webgpu prebuilt repository to androidx-main manifest
Bug: 392602829
Change-Id: If5f2fe2c8fa4684d1ab84cac8311efc1baabc48d
2025-06-24 08:06:41 -07:00
Jossi Wolf
a0d9867d73 Add external/compose-hero-benchmarks/pokedex-views to manifest
Bug: 376200589
Test: repo sync
Change-Id: I6cdac90981f7dbc0667c4155df1958ec40e67a98
2025-04-28 11:12:30 -07:00
Julia McClellan
975dabd26a Move toolchain/prebuilts/ndk-darwin/r27 to aosp/androidx-main
This was not done in aosp/3530413 because the branch hadn't been created
yet.

Bug: 401605709
Test: None
Change-Id: Ice847f1027c60d61ab593104a54171399ee37cd2
2025-03-10 13:12:19 +00:00
Aurimas Liutikas
2e175a9b26 Move to androidx-main branches for projects that used aosp/main
Bug: 399996322
Test: None
Change-Id: I812a1eac7263e70a3a706135d63f29fa5a58a7bf
2025-03-07 13:47:50 -08:00
natnaelbelay
ee3192e91a Register XR project to androidx-main
Change-Id: Ia3ed77096e6b25739a0093739d70679f5c10bf04
2024-12-13 13:22:32 -05:00
Omar Ismail
13732c62b5 Edit default.xml to add darwin dependency to build-tools (linux was already there)
Change-Id: I17d4b891adaafbf54178a1cf913a49a7b407cb2b
2024-11-13 21:46:56 +00:00
Jossi Wolf
41c7c21bb2 Merge "Add poxedex-compose to androidx-main manifest" into androidx-main 2024-10-29 16:01:41 +00:00
Aurimas Liutikas
ae93576e82 Move to androidx specific branch for checkstyle
Change-Id: I106db29b0ae3ae2085c57062427156711043fc33
Test: None
2024-10-21 22:56:00 +00:00
Aurimas Liutikas
b222711dca Add prebuilts/androidx/javascript-for-kotlin/
Bug: 353992565
Change-Id: I749fde0540c42f1ae8e68864ab71f573fb3c057b
2024-10-18 21:14:01 +00:00
Jossi Wolf
52b9556c5d Add poxedex-compose to androidx-main manifest
Test: Repo sync'ed locally
Bug: 367336692
Change-Id: I5a3a67b5d93fd3309301f499006f1e06270becbb
2024-10-11 11:35:31 +01:00
Treehugger Robot
f28c18b462 Merge "Add third-party tool markers to androidx-main manifest" into androidx-main 2024-10-10 17:45:00 +00:00
Aurimas Liutikas
d94fcf6dca Add chrome-for-testing to androidx-main
Change-Id: I5a418da46ba993ee19e8fe6b242a059055b49952
Test: None
2024-10-08 19:30:19 +00:00
Jossi Wolf
d7ada31c23 Add third-party tool markers to androidx-main manifest
Test: Ran repo sync and then 3p tool locally
Change-Id: I3da8429d1bae5894e3d1ab5e0612c3729e494991
2024-10-02 12:36:07 +02:00

View File

@@ -3,65 +3,63 @@
<remote name="aosp" <remote name="aosp"
fetch=".." fetch=".."
review="https://android-review.googlesource.com/" /> review="https://android-review.googlesource.com/" />
<default revision="androidx-main" <default revision="androidx-xr-projected-release"
remote="aosp" /> remote="aosp" />
<superproject name="platform/superproject" remote="aosp"/> <superproject name="platform/superproject" remote="aosp"/>
<!-- BEGIN dependencies --> <!-- BEGIN dependencies -->
<project path="build/make" name="platform/build" /> <project path="build/make" name="platform/build" />
<!-- External dependencies --> <!-- External dependencies -->
<!-- Config: shallow + same revision --> <!-- Config: shallow -->
<project path="external/dexter" name="platform/tools/dexter" clone-depth="1" /> <project path="external/dexter" name="platform/tools/dexter" clone-depth="1" />
<project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" /> <project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" />
<project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" /> <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" />
<project path="external/icing" name="platform/external/icing" clone-depth="1" /> <project path="external/icing" name="platform/external/icing" clone-depth="1" />
<project path="external/icu" name="platform/external/icu" clone-depth="1" /> <project path="external/icu" name="platform/external/icu" clone-depth="1" />
<project path="external/sqlite" name="platform/external/sqlite" clone-depth="1" /> <project path="external/sqlite" name="platform/external/sqlite" clone-depth="1" />
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" />
<project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" />
<project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" />
<!-- External Compose Hero Benchmark Targets -->
<project path="external/compose-hero-benchmarks/poxedex-compose" name="platform/external/compose-hero-benchmarks/poxedex-compose" clone-depth="1"/>
<project path="external/compose-hero-benchmarks/pokedex-views" name="platform/external/compose-hero-benchmarks/pokedex-views" clone-depth="1"/>
<!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf --> <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
<project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" /> <project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" />
<project path="prebuilts/androidx/chrome-for-testing" name="platform/prebuilts/androidx/chrome-for-testing" clone-depth="1" />
<project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" /> <project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" />
<project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" /> <project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" />
<project path="prebuilts/androidx/javascript-for-kotlin" name="platform/prebuilts/androidx/javascript-for-kotlin" clone-depth="1" />
<project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" /> <project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" />
<project path="prebuilts/androidx/ink" name="platform/prebuilts/androidx/ink" clone-depth="1" /> <project path="prebuilts/androidx/ink" name="platform/prebuilts/androidx/ink" clone-depth="1" />
<project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" /> <project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" />
<project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" /> <project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" />
<project path="prebuilts/androidx/webgpu" name="platform/prebuilts/androidx/webgpu" clone-depth="1" />
<!-- Config: shallow + main revision --> <project path="prebuilts/androidx/xr" name="platform/prebuilts/androidx/xr" clone-depth="1" />
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="main" />
<project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="main" />
<project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="main" />
<!-- Tools dependencies --> <!-- Tools dependencies -->
<!-- Config: shallow + main revision --> <!-- Config: shallow + metalava-main revision -->
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="main" /> <project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" />
<project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="main" /> <!-- Config: shallow -->
<project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="main" /> <project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" />
<project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="metalava-main" /> <project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" />
<!-- Config: shallow + same revision --> <project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" />
<!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf --> <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
<project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" /> <project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" />
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" />
<!-- Gradle dependencies --> <!-- Gradle dependencies -->
<!-- Config: shallow + same revision --> <!-- Config: shallow -->
<project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" /> <project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" />
<!-- SDK dependencies --> <!-- SDK dependencies -->
<project <project
path="prebuilts/fullsdk-darwin/platforms" path="prebuilts/fullsdk-darwin/platforms"
name="platform/prebuilts/fullsdk/platforms" name="platform/prebuilts/fullsdk/platforms"
clone-depth="1" clone-depth="1">
revision="main">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms" /> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms" />
</project> </project>
<project <project
path="prebuilts/fullsdk-darwin/sources" path="prebuilts/fullsdk-darwin/sources"
name="platform/prebuilts/fullsdk/sources" name="platform/prebuilts/fullsdk/sources"
clone-depth="1" clone-depth="1">
revision="main">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources" /> <linkfile src="." dest="prebuilts/fullsdk-linux/sources" />
</project> </project>
<!-- darwin specific --> <!-- darwin specific -->
<project <project
path="prebuilts/fullsdk-darwin/build-tools" path="prebuilts/fullsdk-darwin/build-tools"
@@ -83,7 +81,6 @@
name="platform/prebuilts/fullsdk-darwin/tools" name="platform/prebuilts/fullsdk-darwin/tools"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-darwin" /> groups="notdefault,platform-darwin" />
<!-- linux specific --> <!-- linux specific -->
<project <project
path="prebuilts/fullsdk-linux/build-tools" path="prebuilts/fullsdk-linux/build-tools"
@@ -105,24 +102,16 @@
name="platform/prebuilts/fullsdk-linux/tools" name="platform/prebuilts/fullsdk-linux/tools"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-linux" /> groups="notdefault,platform-linux" />
<project
path="prebuilts/build-tools"
name="platform/prebuilts/build-tools"
groups="notdefault,platform-linux"
clone-depth="1" />
<!-- NDK dependencies --> <!-- NDK dependencies -->
<!-- Config: shallow + main revision --> <!-- Config: shallow -->
<project <project
path="prebuilts/fullsdk-darwin/ndk-bundle" path="prebuilts/fullsdk-darwin/ndk-bundle"
name="toolchain/prebuilts/ndk-darwin/r27" name="toolchain/prebuilts/ndk-darwin/r27"
revision="main"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-darwin" /> groups="notdefault,platform-darwin" />
<project <project
path="prebuilts/fullsdk-darwin/cmake" path="prebuilts/fullsdk-darwin/cmake"
name="platform/prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86"
revision="main"
groups="notdefault,platform-darwin" groups="notdefault,platform-darwin"
clone-depth="1"> clone-depth="1">
<linkfile src="bin/cmake" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/cmake" /> <linkfile src="bin/cmake" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/cmake" />
@@ -130,7 +119,6 @@
<project <project
path="prebuilts/fullsdk-darwin/ninja" path="prebuilts/fullsdk-darwin/ninja"
name="platform/prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86"
revision="main"
groups="notdefault,platform-darwin" groups="notdefault,platform-darwin"
clone-depth="1" > clone-depth="1" >
<linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" /> <linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" />
@@ -138,13 +126,11 @@
<project <project
path="prebuilts/fullsdk-linux/ndk-bundle" path="prebuilts/fullsdk-linux/ndk-bundle"
name="toolchain/prebuilts/ndk/r27" name="toolchain/prebuilts/ndk/r27"
revision="main"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-linux" /> groups="notdefault,platform-linux" />
<project <project
path="prebuilts/fullsdk-linux/cmake" path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86"
revision="main"
groups="notdefault,platform-linux" groups="notdefault,platform-linux"
clone-depth="1"> clone-depth="1">
<linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" /> <linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" />
@@ -152,33 +138,28 @@
<project <project
path="prebuilts/fullsdk-linux/ninja" path="prebuilts/fullsdk-linux/ninja"
name="platform/prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86"
revision="main"
groups="notdefault,platform-linux" groups="notdefault,platform-linux"
clone-depth="1" > clone-depth="1" >
<linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" /> <linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" />
</project> </project>
<!-- JDK dependencies --> <!-- JDK dependencies -->
<!-- Config: shallow + main revision --> <!-- Config: shallow -->
<project <project
path="prebuilts/jdk/jdk17" path="prebuilts/jdk/jdk17"
name="platform/prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17"
revision="main"
clone-depth="1" /> clone-depth="1" />
<project <project
path="prebuilts/jdk/jdk21" path="prebuilts/jdk/jdk21"
name="platform/prebuilts/jdk/jdk21" name="platform/prebuilts/jdk/jdk21"
revision="main"
clone-depth="1" /> clone-depth="1" />
<!-- Golden images --> <!-- Golden images -->
<project path="golden" name="platform/frameworks/support-golden" clone-depth="1" /> <project path="golden" name="platform/frameworks/support-golden" clone-depth="1" />
<!-- END dependencies --> <!-- END dependencies -->
<!-- BEGIN target project --> <!-- BEGIN target project -->
<project path="frameworks/support" name="platform/frameworks/support" /> <project path="frameworks/support" name="platform/frameworks/support" />
<!-- END target project --> <!-- END target project -->
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" /> <repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
<!-- go/android3p markers -->
<!-- third_party_review marker START -->
<!-- third_party_review marker END -->
</manifest> </manifest>