Compare commits

...

20 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
70bc192d62 Pin manifest of androidx-compose-g3-release(None)
Change-Id: I5f70b17f95c1a7e262d55ec22b9f87089850b3e1
2024-11-06 17:20:46 +00:00
Android Build Coastguard Worker
4777850d2b Pin manifest of androidx-compose-g3-release(None)
Change-Id: Ic6685bb29a72ceedcd0424179711b0f0894d2dbe
2024-04-17 01:42:53 +00:00
Android Build Coastguard Worker
7ab01f76bf Pin manifest of androidx-compose-g3-release(None)
Change-Id: Ia51f975a2fb38b4c04b061d963e719676814fcdf
2024-04-11 01:33:54 +00:00
Android Build Coastguard Worker
3a00f2fbb2 Pin manifest of androidx-compose-g3-release(None)
Change-Id: Ib120f13559598677b0f199c8b0f5058038ae7fad
2024-04-10 21:21:46 +00:00
Android Build Coastguard Worker
89f3ee4afe Pin manifest of androidx-compose-g3-release(None)
Change-Id: I91abf8c6940bc78a13cb3f6fb7a406402725b2f0
2024-04-10 20:58:48 +00:00
Android Build Coastguard Worker
00e2ff6b55 Pin manifest of androidx-compose-g3-release(None)
Change-Id: I63040a81d602c78edf4121d31b5a9a2654849b1c
2024-04-10 20:31:38 +00:00
Android Build Coastguard Worker
3030922fd9 Pin manifest of androidx-compose-g3-release(None)
Change-Id: I75b170c2cedec8ccf51d3a6820fda51bd4148464
2024-03-05 02:26:22 +00:00
Android Build Coastguard Worker
4dd1be01e3 Pin manifest of androidx-compose-g3-release(None)
Change-Id: I729002af931ac85180894b8b545785511080c5dd
2024-03-04 18:29:18 +00:00
Android Build Coastguard Worker
e1ca20ec7b Pin manifest of androidx-compose-g3-release(None)
Change-Id: Id160914aa3322f4a0745e39831b906b736afd5be
2024-02-13 15:33:30 +00:00
android-build-prod (mdb)
1e6f1bab1f DO NOT MERGE ANYWHERE Create manifest for androidx-compose-g3-release
Change-Id: Ib661a110fe21de456aecff183bcf67bab1e5d147
BUG: 324298574
2024-02-08 21:28:50 +00:00
Aurimas Liutikas
97d32afdc0 Add JDK 21 to androidx checkout
This is not yet used, but we need it to unblock all the issues with using it

Change-Id: Ia534101b22ee6ea242e6c4dbae28780eb74b7a81
Test: None
2024-02-05 19:13:56 +00:00
Aurimas Liutikas
809b9df8e0 Add prebuilts/fullsdk-*/cmdline-tools to the checkout
These will be used to access d8 that is now being published here

Test: None
Change-Id: Ic20fac3586073bbbba769ed167b4796bcb3de2a6
2024-01-19 21:11:07 +00:00
Aurimas Liutikas
df306743b6 Remove external/dokka from the checkout
Change-Id: I5bc59ade79c83ca2c944a5ccaf2f5cbb8b36b61c
Test: None
2023-11-28 22:37:51 +00:00
Aurimas Liutikas
65447015b5 Remove unused google-benchmark project
Change-Id: Ie97865daf1d8bf5c9a260d0bdfb336d6a60aabe5
Test: None
2023-11-28 21:45:00 +00:00
Fred Sladkey
39d38a0a85 Update NDK version to r25
Change-Id: I687c6ad542a9a6c6ee33abc1b1901faeaf80639b
2023-11-06 14:33:49 +00:00
Aurimas Liutikas
c1f004fd13 Remove jdk8 project
It is no longer needed for androidx builds

Change-Id: I1d867cba50dfbaf24d4971b85e600ee322e3367f
2023-10-11 22:32:43 +00:00
Daniel Santiago Rivera
d391faf6cf Add external/sqlite
Change-Id: Ifd9071793f5c836da0ada8aafca6465a9c1c7595
Test: none
2023-09-15 00:01:49 +00:00
Aurimas Liutikas
88426bdb52 Remove kernel-build-tools
Change-Id: I9bf9f3e91120ad72c4da77f1bb860dcb780e0d7a
Test: None
2023-08-14 23:48:14 +00:00
Xin Li
764f2b2bd2 DO NOT MERGE ANYWHERE - Update androidx-main to use main branch.
Bug: b/289400079
Change-Id: Iedec833dac3d33450525887397a63abb9b8e69fa
2023-07-05 23:02:11 -07:00
Aurimas Liutikas
2f725f5c3f Use androidx-main branch for dexter project
Bug: 279993254
Change-Id: I3619e600ea4d8705106703c4cafc533aae62c66d
Test: None
2023-05-10 16:50:27 +00:00

View File

@@ -1,181 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="aosp"
fetch=".."
review="https://android-review.googlesource.com/" />
<default revision="androidx-main"
remote="aosp" />
<superproject name="platform/superproject" remote="aosp"/>
<remote name="aosp" fetch=".." review="https://android-review.googlesource.com/" />
<default revision="androidx-compose-g3-release" remote="aosp" />
<project path="build/make" name="platform/build" revision="65ae044122f690f8134e34fcefdcccd590804836" upstream="androidx-compose-g3-release" />
<!-- BEGIN dependencies -->
<project path="build/make" name="platform/build" />
<project path="external/dexter" name="platform/tools/dexter" clone-depth="1" revision="7bc2c8ccf1db5bd95d471f52ecfe732b5722ff61" upstream="androidx-compose-g3-release" />
<project path="external/noto-fonts" name="platform/external/noto-fonts" clone-depth="1" revision="3f0ee7e5a2ac33a4d8fff8a57a2435722ead1e2f" upstream="androidx-compose-g3-release" />
<project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" clone-depth="1" revision="d1aa66853cf52b34c104b8817f98fd88a9500b27" upstream="androidx-compose-g3-release" />
<project path="external/icing" name="platform/external/icing" clone-depth="1" revision="a81a0c8cb5c424e6eed6cec1bd687bc4d609e6cd" upstream="androidx-compose-g3-release" />
<project path="external/icu" name="platform/external/icu" clone-depth="1" revision="304410e63a5426aa480a450f7386b3e1ff240096" upstream="androidx-compose-g3-release" />
<project path="external/sqlite" name="platform/external/sqlite" clone-depth="1" revision="faf50912c8ff37d969db9c9d4b8f1e3139f28a7c" upstream="androidx-compose-g3-release" />
<project path="external/protobuf" name="platform/external/protobuf" clone-depth="1" revision="24a7e90629553667d2c1f5f748e5c5242790f7e5" upstream="androidx-compose-g3-release" />
<project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" clone-depth="1" revision="91dde8a8163ca9d377313b063a19bc1d136ceb64" upstream="androidx-compose-g3-release" />
<project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" clone-depth="1" revision="0ee64dbccf7441576bc68ca8066163c072cf3b53" upstream="androidx-compose-g3-release" />
<project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" clone-depth="1" revision="8759893b15627e09a76140ae550f478c782d3387" upstream="androidx-compose-g3-release" />
<project path="prebuilts/androidx/traceprocessor" name="platform/prebuilts/androidx/traceprocessor" clone-depth="1" revision="b9d86a1c98702b7a47f33418cb4f573c2080a9c5" upstream="androidx-compose-g3-release" />
<project path="prebuilts/androidx/konan" name="platform/prebuilts/androidx/konan" clone-depth="1" revision="9366d25f9d1d35adb68de533e5afd85c4dd247c2" upstream="androidx-compose-g3-release" />
<!-- External dependencies -->
<!-- Config: shallow + same revision -->
<project path="external/dexter" name="platform/tools/dexter" revision="74c2cf6b983956ac8e9a23422a4d6a08c0019bf5" />
<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" />
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="56402997ce9340dd62447677fbcfb1bf0f2b680e" upstream="androidx-compose-g3-release" />
<project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="2a7a122b5c5b145a9e967b69ed8c3b02f8514f73" upstream="androidx-compose-g3-release" />
<project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="e9c017255b78f718742fe2c4c477d908a6746a0d" upstream="androidx-compose-g3-release" />
<!-- Config: shallow + master revision -->
<project path="external/abseil-cpp" name="platform/external/abseil-cpp" clone-depth="1" revision="master" />
<project path="external/dokka" name="platform/external/dokka" clone-depth="1" revision="master" />
<project path="external/ink-stroke-modeler" name="platform/external/ink-stroke-modeler" clone-depth="1" revision="master" />
<project path="external/libyuv" name="platform/external/libyuv" clone-depth="1" revision="master" />
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="7e0769cbb9f49b077523a537fc19f8c9e02bcb81" upstream="androidx-compose-g3-release" />
<project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="f0a1d58c684cb8b2ffb7f1faf89534a8334a9bb6" upstream="androidx-compose-g3-release" />
<project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="7d5d8c7e36eb15d8a5389ca19e3b0aeb1daa1326" upstream="androidx-compose-g3-release" />
<project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="fea78ad4c502bf691dbf92c9f8d3e5916ba8de04" upstream="androidx-compose-g3-release" />
<project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" clone-depth="1" revision="1032661b632ef1325de4c4829008dab8571c346e" upstream="androidx-compose-g3-release" />
<!-- Tools dependencies -->
<!-- Config: shallow + master revision -->
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" clone-depth="1" revision="master" />
<project path="tools/repohooks" name="platform/tools/repohooks" clone-depth="1" revision="master" />
<project path="tools/fetch_artifact" name="tools/fetch_artifact" clone-depth="1" revision="master" />
<project path="tools/metalava" name="platform/tools/metalava" clone-depth="1" revision="metalava-main" />
<!-- 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" />
<project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" revision="41403fe0721e9b2b3b8b65728376e4c5fcd6c8bb" upstream="androidx-compose-g3-release" />
<!-- Gradle dependencies -->
<!-- Config: shallow + same revision -->
<project path="tools/external/gradle" name="platform/tools/external/gradle" clone-depth="1" />
<!-- SDK dependencies -->
<project
path="prebuilts/fullsdk-darwin/platforms"
name="platform/prebuilts/fullsdk/platforms"
clone-depth="1"
revision="master">
<project path="prebuilts/fullsdk-darwin/platforms" name="platform/prebuilts/fullsdk/platforms" clone-depth="1" revision="590f815c2c9ad3a9cb7d9387bd5820a932689269" upstream="androidx-compose-g3-release">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms" />
</project>
<project
path="prebuilts/fullsdk-darwin/sources"
name="platform/prebuilts/fullsdk/sources"
clone-depth="1"
revision="master">
<project path="prebuilts/fullsdk-darwin/sources" name="platform/prebuilts/fullsdk/sources" clone-depth="1" revision="bcfbe3a5fc572ea731c08053d83160e677c877da" upstream="androidx-compose-g3-release">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources" />
</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" />
<project path="prebuilts/fullsdk-darwin/build-tools" name="platform/prebuilts/fullsdk-darwin/build-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="55b52647b92730a50b9a76e0dc4ad327f3c1797f" upstream="androidx-compose-g3-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-compose-g3-release" />
<project path="prebuilts/fullsdk-darwin/platform-tools" name="platform/prebuilts/fullsdk-darwin/platform-tools" clone-depth="1" groups="notdefault,platform-darwin" revision="66cfc73d41cc4900eef4ad35e3ddc9c259f241db" upstream="androidx-compose-g3-release" />
<project path="prebuilts/fullsdk-darwin/tools" name="platform/prebuilts/fullsdk-darwin/tools" clone-depth="1" groups="notdefault,platform-darwin" revision="204b8813ffedef10214a4afe04c843f1ee9e4fe7" upstream="androidx-compose-g3-release" />
<!-- 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" />
<project path="prebuilts/fullsdk-linux/build-tools" name="platform/prebuilts/fullsdk-linux/build-tools" clone-depth="1" groups="notdefault,platform-linux" revision="1c501d7408ba25c4ae731322481f69c60e21498b" upstream="androidx-compose-g3-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-compose-g3-release" />
<project path="prebuilts/fullsdk-linux/platform-tools" name="platform/prebuilts/fullsdk-linux/platform-tools" clone-depth="1" groups="notdefault,platform-linux" revision="1cf6dcf8a0ab4869c5efc660f663d10cee11cae2" upstream="androidx-compose-g3-release" />
<project path="prebuilts/fullsdk-linux/tools" name="platform/prebuilts/fullsdk-linux/tools" clone-depth="1" groups="notdefault,platform-linux" revision="2d5e66a40bd1e6d43ee458efea6f1dd5d5166a59" upstream="androidx-compose-g3-release" />
<project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" groups="notdefault,platform-linux" clone-depth="1" revision="f1e15ee3498c00a329ce89d2758a5542368c209a" upstream="androidx-compose-g3-release" />
<!-- 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" />
<project
path="prebuilts/fullsdk-darwin/cmake"
name="platform/prebuilts/cmake/darwin-x86"
revision="master"
groups="notdefault,platform-darwin"
clone-depth="1">
<project path="prebuilts/fullsdk-darwin/ndk-bundle" name="toolchain/prebuilts/ndk-darwin/r25" revision="9c16cc8e08a81c6ab7152269ab68cdab347185a3" clone-depth="1" groups="notdefault,platform-darwin" upstream="androidx-compose-g3-release" />
<project path="prebuilts/fullsdk-darwin/cmake" name="platform/prebuilts/cmake/darwin-x86" revision="7aea7e9880110799088cd1de509886871078306f" groups="notdefault,platform-darwin" clone-depth="1" upstream="androidx-compose-g3-release">
<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"
revision="master"
groups="notdefault,platform-darwin"
clone-depth="1" >
<project path="prebuilts/fullsdk-darwin/ninja" name="platform/prebuilts/ninja/darwin-x86" revision="f321e197944c19d273cec788b9a3e8ca94331248" groups="notdefault,platform-darwin" clone-depth="1" upstream="androidx-compose-g3-release">
<linkfile src="ninja" dest="prebuilts/fullsdk-darwin/native-build-tools/bin/ninja" />
</project>
<project
path="prebuilts/fullsdk-linux/ndk-bundle"
name="toolchain/prebuilts/ndk/r23"
revision="master"
clone-depth="1"
groups="notdefault,platform-linux" />
<project
path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86"
revision="master"
groups="notdefault,platform-linux"
clone-depth="1">
<project path="prebuilts/fullsdk-linux/ndk-bundle" name="toolchain/prebuilts/ndk/r25" revision="b3c374095fb89ba448e5a9f2f7fa28e2fc35ecdb" clone-depth="1" groups="notdefault,platform-linux" upstream="androidx-compose-g3-release" />
<project path="prebuilts/fullsdk-linux/cmake" name="platform/prebuilts/cmake/linux-x86" revision="001ed46e3703c78cbc3838adfe4c14ba279f9ff7" groups="notdefault,platform-linux" clone-depth="1" upstream="androidx-compose-g3-release">
<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"
revision="master"
groups="notdefault,platform-linux"
clone-depth="1" >
<project path="prebuilts/fullsdk-linux/ninja" name="platform/prebuilts/ninja/linux-x86" revision="8a10824f74fe0e22af9bf314a837f5b70e2bb67f" groups="notdefault,platform-linux" clone-depth="1" upstream="androidx-compose-g3-release">
<linkfile src="ninja" dest="prebuilts/fullsdk-linux/native-build-tools/bin/ninja" />
</project>
<project
path="prebuilts/fullsdk-linux/kernel-build-tools"
name="kernel/prebuilts/build-tools"
revision="master"
groups="notdefault,platform-linux"
clone-depth="1" />
<!-- JDK dependencies -->
<!-- Config: shallow + master revision -->
<project
path="prebuilts/jdk/jdk17"
name="platform/prebuilts/jdk/jdk17"
revision="master"
clone-depth="1" />
<!-- This branch of JDK 8 contains only the tools JAR required for Compose tests. -->
<!-- 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" />
<project path="prebuilts/jdk/jdk17" name="platform/prebuilts/jdk/jdk17" revision="2f66c3049e581b5dec145694f7e775a86e870ba4" clone-depth="1" upstream="androidx-compose-g3-release" />
<project path="prebuilts/jdk/jdk21" name="platform/prebuilts/jdk/jdk21" revision="4cc26f67c6316e8c092bc91db870f206433c0a34" clone-depth="1" upstream="androidx-compose-g3-release" />
<project path="golden" name="platform/frameworks/support-golden" clone-depth="1" revision="56cdc4ff019b6e46ae56eb3fb6576eb761a40a54" upstream="androidx-compose-g3-release" />
<!-- END dependencies -->
<!-- BEGIN target project -->
<project path="frameworks/support" name="platform/frameworks/support" />
<!-- END target project -->
<project path="frameworks/support" name="platform/frameworks/support" revision="e9fb13efd95d9aafdca193588deae8df656a2a43" upstream="androidx-compose-g3-release" />
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
</manifest>
</manifest>