Compare commits

..

13 Commits

Author SHA1 Message Date
android-build-prod (mdb)
4791f48f5f DO NOT MERGE ANYWHERE Create manifest for androidx-customview-customview-poolingcontainer-release
Change-Id: I07f750d86d75dda0d7581cd444eae79c6ee6454d
BUG: 235080036
2022-06-14 04:00:19 +00:00
Aurimas Liutikas
971fcc4112 Move to metalava-main instead of master
Change-Id: I36ab36ce090717a133f60a0f7e3089c69f4c293e
Test: None
2022-05-18 21:13:22 +00:00
Aurimas Liutikas
e520ecdb5d Move to using androidx-main for fullsdk-* projects
Bug: 229911554
Change-Id: Ia039457321c1764246db72bf48e674a856885469
Test: presubmit
2022-05-09 23:12:33 +00:00
Alan Viverette
da86bf44a7 Add SDK 32 fullsdk to repo manifest
Bug: 230495534
Change-Id: I56302e403bd6fa42a56b11a92e309f92e209c1ba
2022-05-06 20:37:02 +00:00
Fred Sladkey
21d80c32ce Change NDK path form $SDK/ndk to $SDK/ndk-bundle which is a standard location which AGP will check for.
Doesn't require any AndroidX changes because this is also one of the standard locations we check for.

Verified locally and by running presubmit on a topic with an empty commit in androidx-main.

Bug: b/229631212
Change-Id: I95e3a8787da6dd236215240e069f3aa6b763466b
2022-05-04 15:48:23 +00:00
Alan Viverette
5aa8bead17 Prepare androidx-main for Tiramisu SDK finalization
Bug: 229975895
Test: repo sync
Change-Id: I3e4e1bfaf9e1736bdade1052352ea9947dbf5fc9
2022-04-22 18:54:37 +00:00
Aurimas Liutikas
e57d096e13 Move to prebuilts/fullsdk-linux/build-tools/
Stop using per-version repository for build tools, instead use
one that can store all the version

Change-Id: I9deb0242e1315d1cd84f3c987ca649258b6fb30a
Test: None
Bug: 216480904
2022-04-21 00:33:59 +00:00
Sam Gilbert
2302c4326c Add metalava to androidx repo
Change-Id: Ie2a014007a7061070d1f263ec3d6950a3eaf29f9
Bug: 228469190
2022-04-07 18:24:10 +00:00
Samuel Freilich
323fc69475 Fix path for external/ink-stroke-modeler
Also add external dependencies for ink-stroke-modeler (abseil-cpp and
googletest) to the manifest.

BUG: 226647693

Test: TH
Change-Id: I0c7f0b812c408f45dd27dd1dd31de046915e1d38
2022-03-29 11:43:32 -04:00
Samuel Freilich
c662dc6710 Add external/ink-stroke-modeler to manifest
BUG: 226647693

Test: TH
Change-Id: I5df592d5728c9673cc44dbca37d15d57a1d1f994
2022-03-28 15:27:23 -04:00
David Saff
0833025177 Add build-tools to use nsjail to block network in CI.
Bug: 200310433
Change-Id: I454aed525d9f97c9d66cf7222e7c51626ae121ef
2022-03-21 16:59:58 -04:00
Aurimas Liutikas
f3dae49e4e Add build-tools 32.1.0
By the time I got to adding 32.0.0, 32.1.0 is already available.

Bug: 216480904
Change-Id: I746ec3e247d8ee64aa8460f2a33c11fc88ea6476
2022-02-11 17:52:17 +00:00
David Saff
1511845adf Add konan dependencies project to androidx-main repo manifest
Bug: 218326769
Change-Id: I737dc7b82f679c9c2a762e07aa47660446d0c2c2
2022-02-07 13:32:47 -05:00

View File

@@ -1,109 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
<default revision="androidx-metrics-release" remote="aosp" />
<project path="build/make" name="platform/build" revision="02c425b396318aeef835cc88ccb6f58c3b67e2d6" upstream="androidx-metrics-release" />
<project path="external/dexter" name="platform/tools/dexter" clone-depth="1" revision="466f2bb20b3daab0754a47bd5b6720e2beaf81f1" upstream="androidx-metrics-release" />
<project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" revision="acc5108afd547e7eb70789029fcdbf84a99df97d" upstream="androidx-metrics-release" />
<project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" revision="31af7b26152391f073c6ee8264545b318d4fda8c" upstream="androidx-metrics-release" />
<project path="external/icing" name="platform/external/icing" clone-depth="1" revision="0811f4b87f75bd0fe441348e534dfcce916038d2" upstream="androidx-metrics-release" />
<project path="external/icu" name="platform/external/icu" clone-depth="1" revision="304410e63a5426aa480a450f7386b3e1ff240096" upstream="androidx-metrics-release" />
<project path="external/sqlite" name="platform/external/sqlite" clone-depth="1" revision="9e98e5258f7faa6b326ce3d8042843e7d90704f0" upstream="androidx-metrics-release" />
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="a28580f68f988692d504c4197e7a92ca911e29af" upstream="androidx-metrics-release" />
<project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="6cc88454220223252d5e7cb22fc46518b5595a0e" upstream="androidx-metrics-release" />
<project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="d3a7c3673a795fca18e0b067ef7c90a41af75deb" upstream="androidx-metrics-release" />
<project path="external/compose-hero-benchmarks/poxedex-compose" name="platform/external/compose-hero-benchmarks/poxedex-compose" clone-depth="1" revision="6fe557756b7607eeb8183acfac73acf022d837e9" upstream="androidx-metrics-release" />
<project path="external/compose-hero-benchmarks/pokedex-views" name="platform/external/compose-hero-benchmarks/pokedex-views" clone-depth="1" revision="d835302c1a2df521e1872b2a53312a90f81ea3dd" upstream="androidx-metrics-release" />
<project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" revision="ad938c29bd231d47172885de4a10b6aab712af76" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/chrome-for-testing" name="platform/prebuilts/androidx/chrome-for-testing" clone-depth="1" revision="554ec2c1ece82dcbe358592caf4c86a11ea49e62" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" revision="7b44a7f1495af6619e6d65fc16207b22c22d4450" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" revision="153e3b0b00b919a880b95dae9ae60a866049c25e" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/javascript-for-kotlin" name="platform/prebuilts/androidx/javascript-for-kotlin" clone-depth="1" revision="bc2925bb738109197c92574297582bed69d1bd8e" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" revision="8759893b15627e09a76140ae550f478c782d3387" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/ink" name="platform/prebuilts/androidx/ink" clone-depth="1" revision="a24fb349c0c4976d7c7c5d0ded4664a8f4e9089a" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" revision="7b445d05aa272be18c72bc13bf6dafaa3ecc0998" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" revision="0d87ff46832cda3818ad725b9e9bc5a7f5771917" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/webgpu" name="platform/prebuilts/androidx/webgpu" clone-depth="1" revision="f88470eb4a308c9cc196818fb18bae2453e7b478" upstream="androidx-metrics-release" />
<project path="prebuilts/androidx/xr" name="platform/prebuilts/androidx/xr" clone-depth="1" revision="e7b0cd2d95a5742bab3bc94e868013e9f8d4ca7d" upstream="androidx-metrics-release" />
<project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="7a224b46f931a6431cdf8b7931a83864c91b6b8c" upstream="androidx-metrics-release" />
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="b8ab509239cafa9d1c77d483c22df119cf7f1508" upstream="androidx-metrics-release" />
<project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="df1004dd2512583cf4e88f5dfb2cdcfa55c276be" upstream="androidx-metrics-release" />
<project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="98bbbf4f6b66db8be6294c9f82eecc5aa429fbc2" upstream="androidx-metrics-release" />
<project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" revision="1032661b632ef1325de4c4829008dab8571c346e" upstream="androidx-metrics-release" />
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" revision="645a7339a4d59d46aa57f89dd70eeed02d88cacc" upstream="androidx-metrics-release" />
<project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="06408dd1e10ed904400753efcc70c210bcc96e3c" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/platforms" name="platform/prebuilts/fullsdk/platforms" clone-depth="1" revision="81b1964b09a49fd536e2dc6a8f484e9aaa4dbba7" upstream="androidx-metrics-release">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms" />
<remote name="aosp"
fetch=".."
review="https://android-review.googlesource.com/" />
<default revision="androidx-customview-customview-poolingcontainer-release"
remote="aosp" />
<superproject name="platform/superproject" remote="aosp"/>
<!-- BEGIN dependencies -->
<project path="build/make" name="platform/build" />
<!-- External dependencies -->
<!-- Config: shallow + same revision -->
<project path="external/dexter" name="platform/tools/dexter" />
<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/icing" name="platform/external/icing" clone-depth="1" />
<project path="external/icu" name="platform/external/icu" clone-depth="1" />
<project path="external/google-benchmark" name="platform/external/google-benchmark" clone-depth="1" />
<!-- 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="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/exoplayer" name="platform/prebuilts/androidx/exoplayer" 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" />
<!-- Config: shallow + master revision -->
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" />
<project path="external/doclava" name="platform/external/doclava" clone-depth="1" />
<project path="external/dokka" name="platform/external/dokka" 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" />
<!-- Tools dependencies -->
<!-- Config: shallow + master revision -->
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" />
<project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" />
<project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" />
<project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" />
<!-- Config: shallow + same revision -->
<!-- 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" />
<!-- Gradle dependencies -->
<!-- Config: shallow + same revision -->
<project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" />
<!-- SDK dependencies -->
<!-- Config: shallow + same revision -->
<project
path="prebuilts/fullsdk-darwin/platforms/android-31"
name="platform/prebuilts/fullsdk/platforms/android-31"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-31" />
</project>
<project path="prebuilts/fullsdk-darwin/sources" name="platform/prebuilts/fullsdk/sources" clone-depth="1" revision="dc3f885ebe8ddc75bd9cf2d567eef4d1ed433a09" upstream="androidx-metrics-release">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources" />
<project
path="prebuilts/fullsdk-darwin/sources/android-31"
name="platform/prebuilts/fullsdk/sources/android-31"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-31" />
</project>
<project path="prebuilts/fullsdk-darwin/build-tools" name="platform/prebuilts/fullsdk-darwin/build-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="a631650a8ecc7e70b575ac370e4e36af8e6f6205" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/cmdline-tools" name="platform/prebuilts/fullsdk-darwin/cmdline-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="259b6a33db4ae6e34ce4121c79b48b222f9815ff" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/platform-tools" name="platform/prebuilts/fullsdk-darwin/platform-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="8e061f1a7e011eb3bf64c786cb5c060b2d4fde43" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/tools" name="platform/prebuilts/fullsdk-darwin/tools" clone-depth="1" groups="notdefault,platform-darwin" revision="204b8813ffedef10214a4afe04c843f1ee9e4fe7" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-linux/build-tools" name="platform/prebuilts/fullsdk-linux/build-tools" clone-depth="1" groups="notdefault,platform-linux" revision="347a3f06e6630ac50f5ce5fd31733144cec60b49" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-linux/cmdline-tools" name="platform/prebuilts/fullsdk-linux/cmdline-tools" clone-depth="1" groups="notdefault,platform-linux" revision="066e40b1aba006cf95698c9d34a5c50ff992f5d8" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-linux/platform-tools" name="platform/prebuilts/fullsdk-linux/platform-tools" clone-depth="1" groups="notdefault,platform-linux" revision="864212264a76233a73dba873fc4c82b526e30b26" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-linux/tools" name="platform/prebuilts/fullsdk-linux/tools" clone-depth="1" groups="notdefault,platform-linux" revision="2d5e66a40bd1e6d43ee458efea6f1dd5d5166a59" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/ndk-bundle" name="toolchain/prebuilts/ndk-darwin/r27" clone-depth="1" groups="notdefault,platform-darwin" revision="ca75344ceaacb4e90888371aa3b640d8f4fbcfa8" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-darwin/cmake" name="platform/prebuilts/cmake/darwin-x86" groups="notdefault,platform-darwin" clone-depth="1" revision="7aea7e9880110799088cd1de509886871078306f" upstream="androidx-metrics-release">
<project
path="prebuilts/fullsdk-darwin/platforms/android-32"
name="platform/prebuilts/fullsdk/platforms/android-32"
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"
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"
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"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-33" />
</project>
<!-- darwin specific -->
<project
path="prebuilts/fullsdk-darwin/build-tools"
name="platform/prebuilts/fullsdk-darwin/build-tools"
clone-depth="1"
groups="notdefault,platform-darwin" />
<project
path="prebuilts/fullsdk-darwin/platform-tools"
name="platform/prebuilts/fullsdk-darwin/platform-tools"
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"
clone-depth="1"
groups="notdefault,platform-darwin" />
<project
path="prebuilts/fullsdk-darwin/cmake"
name="platform/prebuilts/cmake/darwin-x86"
groups="notdefault,platform-darwin"
clone-depth="1">
<linkfile src="bin/cmake" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/cmake" />
</project>
<project path="prebuilts/fullsdk-darwin/ninja" name="platform/prebuilts/ninja/darwin-x86" groups="notdefault,platform-darwin" clone-depth="1" revision="da4c0046f9e465064ae8f907f27b028e48879a46" upstream="androidx-metrics-release">
<project
path="prebuilts/fullsdk-darwin/ninja"
name="platform/prebuilts/ninja/darwin-x86"
groups="notdefault,platform-darwin"
clone-depth="1" >
<linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" />
</project>
<project path="prebuilts/fullsdk-linux/ndk-bundle" name="toolchain/prebuilts/ndk/r27" clone-depth="1" groups="notdefault,platform-linux" revision="225774eea0dd4a39459baab12f3ddf93453b2b66" upstream="androidx-metrics-release" />
<project path="prebuilts/fullsdk-linux/cmake" name="platform/prebuilts/cmake/linux-x86" groups="notdefault,platform-linux" clone-depth="1" revision="24b75504e83a3328bb5d0779090e4a502e930d16" upstream="androidx-metrics-release">
<project
path="prebuilts/fullsdk-linux/ndk-bundle"
name="toolchain/prebuilts/ndk/r23"
clone-depth="1"
groups="notdefault,platform-linux" />
<project
path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86"
groups="notdefault,platform-linux"
clone-depth="1">
<linkfile src="bin/cmake" dest="prebuilts/fullsdk-linux/native-build-tools/bin/cmake" />
</project>
<project path="prebuilts/fullsdk-linux/ninja" name="platform/prebuilts/ninja/linux-x86" groups="notdefault,platform-linux" clone-depth="1" revision="a48c10b4292d484ce396f771815e6c22d22aa737" upstream="androidx-metrics-release">
<project
path="prebuilts/fullsdk-linux/ninja"
name="platform/prebuilts/ninja/linux-x86"
groups="notdefault,platform-linux"
clone-depth="1" >
<linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" />
</project>
<project path="prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17" clone-depth="1" revision="cdb53e7416477a277c1e4a704994cee41af68ba5" upstream="androidx-metrics-release" />
<project path="prebuilts/jdk/jdk21" name="platform/prebuilts/jdk/jdk21" clone-depth="1" revision="0e22aabd6abebffb8603b64fb070d95b76f558ec" upstream="androidx-metrics-release" />
<project path="golden" name="platform/frameworks/support-golden" clone-depth="1" revision="f4089ac0d7906f30bc67bb29f163d21fa24cb131" upstream="androidx-metrics-release" />
<project path="frameworks/support" name="platform/frameworks/support" revision="45d9ff85a8fad0fe921ab094f57d33dade94babd" upstream="androidx-metrics-release" />
<project
path="prebuilts/fullsdk-linux/kernel-build-tools"
name="kernel/prebuilts/build-tools"
groups="notdefault,platform-linux"
clone-depth="1" />
<!-- JDK dependencies -->
<!-- Config: shallow + master revision -->
<project
path="prebuilts/jdk/jdk11"
name="platform/prebuilts/jdk/jdk11"
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" />
<!-- END dependencies -->
<!-- BEGIN target project -->
<project path="frameworks/support" name="platform/frameworks/support" />
<!-- END target project -->
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
</manifest>
</manifest>