Compare commits

...

19 Commits

Author SHA1 Message Date
android-build-prod (mdb)
210af810f2 Pin manifest of androidx-security-security-crypto-release
Change-Id: Ibefc8eed2beb1488701b37a06071bfa9b5fb8344
2020-07-15 14:03:01 +00:00
android-build-prod (mdb)
04c3da0070 Pin manifest of androidx-security-security-crypto-release
Change-Id: I62c615943411da808802079e7a2b92855d0d0a92
2020-07-13 20:36:45 +00:00
android-build-prod (mdb)
9e134bd9c0 Pin manifest of androidx-security-security-crypto-release
Change-Id: I54dec42e7aa8feb647009aa4549f891f377683e6
2020-07-08 19:34:08 +00:00
android-build-prod (mdb)
d467c37af7 Pin manifest of androidx-security-security-crypto-release
Change-Id: Ifdcaaa36fb3abac84365267125d3f06332f2fb7c
2020-05-18 14:47:32 +00:00
android-build-prod (mdb)
79e6057891 Pin manifest of androidx-security-security-crypto-release
Change-Id: I0c86ad4af935d9b83249fa35dcf50c4295a73776
2020-04-02 18:28:10 +00:00
android-build-prod (mdb)
3bdef26ccd Pin manifest of androidx-security-security-crypto-release
Change-Id: Iafb874b849252a4d82817eb3b9b06beae73dcc17
2020-03-17 20:25:46 +00:00
android-build-prod (mdb)
51b4a08e84 Pin manifest of androidx-security-security-crypto-release
Change-Id: I770726ba35cf1b629a491c752d7be7c42661e678
2020-03-16 23:55:42 +00:00
android-build-prod (mdb)
18e4a36f44 Pin manifest of androidx-security-security-crypto-release
Change-Id: I1d3688af8ff3688e82af22fe21ae5d6714119e70
2020-03-16 15:05:29 +00:00
android-build-prod (mdb)
ad6bdbf09a DO NOT MERGE ANYWHERE Create manifest for androidx-security-security-crypto-release
Change-Id: If3bcff11c0611b01e6a61d9282356e64b3b5fb0a
BUG: 151460462
2020-03-13 21:01:19 +00:00
Alexander Dorokhine
b06544a7c0 Pin CMake to 3.10.2 for androidx-master-dev.
This is the CMake version supported by the external NDK. For the current
HEAD CMake (3.16), gradle crashes with this output:

Could not determine the dependencies of task 'generateJsonModelRelease'.
> Invalid revision: 3.16.4-gb714ebc

Bug: 149853706
Change-Id: I4725b4facdf1ff94834a8efd7d732c4c03c7869a
2020-03-03 14:14:26 -08:00
Alexander Dorokhine
368e1e5cdd Fetch full history of external/icing.
This is the first downstream landing point of this project and we need
to make Android integration changes here. Having a shallow clone makes
this difficult.

Bug: 149427674
Change-Id: I7d8a58d738d764bc44af7ff3489a0f5c70394f49
2020-03-03 12:38:50 -08:00
Aurimas Liutikas
fa7ce35226 Remove unused build tools project.
Test: None, relying on treehugger.

Change-Id: Ib8948d4aac14ba25a719d36e2a278bc8304b0ed6
2020-02-28 05:46:01 +00:00
Aurimas Liutikas
55775059b9 Upgrade to Gradle 6.2
Change-Id: I657ff3f9edb11c5ea09fc0805d9feb5c8aa4afe0
Test: ./gradlew bOS
2020-02-21 18:55:46 +00:00
Alexander Dorokhine
a76ae54390 Add external/protobuf to androidx-master-dev manifest.
The C++ protobuf library is required to compile external/icing C++ code.
It is not available on Maven.

Bug: 149853706
Change-Id: I4185fc50a3262051fdf2ad888ce90a2b88e4cf1a
2020-02-19 17:14:09 -08:00
Alexander Dorokhine
6c5dc9e11e Add external/icing to androidx-master-dev manifest.
Bug: 149427674
Change-Id: Iec634bce08459aa9aec558adb3c2894e9fd9b5c5
2020-02-18 15:44:37 -08:00
Aurimas Liutikas
e6d6a40d93 Add JDK11 as a dependency
Change-Id: I83ea22be500780c352c24b8f62154bebaec274d0
2020-02-14 16:56:06 +00:00
Louis Pullen-Freilich
ae498b65bb Adds build tools 29.0.3 repository
Removes 29.0.0 that is empty and never used

Test: n/a
Change-Id: I67b35dd762f37d88d006c0017520ff7b1a8c761d
2020-01-28 17:28:50 +00:00
Aurimas Liutikas
41b5ae4cbe Move to using Gradle 6.1
Change-Id: I5845f6e8f12188a890a0f5b8e61962b802d2640f
Test: ./gradlew buildOnServer
2020-01-23 00:49:59 +00:00
Hazem Ashmawy
098f0bed7f [AndroidX Webkit] roll boundary interfaces to 42cb598
This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
77b0f946f2..42cb5981aa

Test: N/A
2020-01-16 15:18:21 +00:00

View File

@@ -1,142 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="aosp"
fetch=".."
review="https://android-review.googlesource.com/" />
<default revision="androidx-master-dev"
remote="aosp"
sync-j="8" />
<!-- BEGIN dependencies -->
<project path="build/make" name="platform/build" />
<!-- External dependencies -->
<!-- Config: shallow + same revision -->
<project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" clone-depth="1" revision="master" />
<project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" groups="pdk" clone-depth="1" revision="77b0f946f298d56f1b6d7e3b13d27c06f363714b" />
<project path="external/doclava" name="platform/external/doclava" groups="pdk" clone-depth="1" revision="master" />
<project path="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="master" />
<project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" groups="pdk" clone-depth="1" />
<project path="prebuilts/androidx/internal" name="platform/prebuilts/androidx/internal" groups="pdk" clone-depth="1" />
<project path="prebuilts/androidx/exoplayer" name="platform/prebuilts/androidx/exoplayer" groups="pdk" clone-depth="1" />
<project path="prebuilts/androidx/studio" name="platform/prebuilts/androidx/studio" groups="pdk" clone-depth="1" />
<!-- Tools dependencies -->
<!-- Config: shallow + master revision -->
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" groups="pdk-fs" clone-depth="1" revision="master" />
<project path="prebuilts/ktlint" name="platform/prebuilts/ktlint" groups="pdk-fs" clone-depth="1" revision="master" />
<project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" revision="master" />
<!-- Gradle dependencies -->
<!-- Config: shallow + specific revision -->
<project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" revision="6.0" clone-depth="1" />
<!-- SDK dependencies (shared) -->
<!-- Config: shallow + master revision -->
<project
path="prebuilts/fullsdk-darwin/platforms/android-28"
name="platform/prebuilts/fullsdk/platforms/android-28"
revision="master"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-28" />
<remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
<default remote="aosp" revision="androidx-security-security-crypto-release" sync-j="8" />
<project name="platform/build" path="build/make" revision="bb939353afde97540988e8fd15d24e719ebf361e" />
<project name="platform/manifest" path="manifest" revision="04c3da0070feca6691f9456103893802faa18c77" />
<project clone-depth="1" groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" revision="0631927f33564c1ee04f90a2f139cdcd104bd000" />
<project clone-depth="1" groups="pdk" name="platform/external/webview_support_interfaces" path="external/webview_support_interfaces" revision="3c2cbc3611b4cc4469ee26be57d274dc2309eaaf" />
<project clone-depth="1" groups="pdk" name="platform/external/doclava" path="external/doclava" revision="32365803381b1c49a164cce8e4728cbca6152ed9" />
<project clone-depth="1" groups="pdk" name="platform/external/dokka" path="external/dokka" revision="79ed7b08a1618be3ffd01baac1f34d61d0c543f9" />
<project groups="pdk" name="platform/external/icing" path="external/icing" revision="cc6842cfefbcd85a9f7413380545c33022630cc9" />
<project clone-depth="1" groups="pdk" name="platform/external/icu" path="external/icu" revision="a46f05225df3bee92a6ff3a51b2b14e659ef9337" />
<project clone-depth="1" groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="6fbcf5b4566b994a74775cd50e504c1a07720f62" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/androidx/external" path="prebuilts/androidx/external" revision="a03dec5b77ac60a6a15d40c33a2e289fbc6fad66" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/androidx/internal" path="prebuilts/androidx/internal" revision="9917c06d5e52a0c53a5a7b75e581ea8acf9e91e7" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/androidx/exoplayer" path="prebuilts/androidx/exoplayer" revision="8759893b15627e09a76140ae550f478c782d3387" />
<project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="896099af6c78d9495109481e23bc43664c705298" />
<project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/protobuf" path="prebuilts/protobuf" revision="7f770bcfc83d43216b156d29c38a833a51e4c7e6" />
<project groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="2ed3b21a81d977ea5613ae2261c5cf566b13d8ab" />
<project clone-depth="1" groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" revision="6ccaf15810f4b17422b07933265638fe737cefd1" />
<project clone-depth="1" name="platform/prebuilts/fullsdk/platforms/android-29" path="prebuilts/fullsdk-darwin/platforms/android-29" revision="50e91e4827cdd58e191c942d33db0cc61362cdf6">
<linkfile dest="prebuilts/fullsdk-linux/platforms/android-29" src="." />
</project>
<project
path="prebuilts/fullsdk-darwin/platforms/android-29"
name="platform/prebuilts/fullsdk/platforms/android-29"
revision="master"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-29" />
<project clone-depth="1" name="platform/prebuilts/fullsdk/sources/android-29" path="prebuilts/fullsdk-darwin/sources/android-29" revision="05336000acd22925dd2de097a4d9ada6e9cdb348">
<linkfile dest="prebuilts/fullsdk-linux/sources/android-29" src="." />
</project>
<project
path="prebuilts/fullsdk-darwin/sources/android-28"
name="platform/prebuilts/fullsdk/sources/android-28"
revision="master"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-28" />
<project clone-depth="1" name="platform/prebuilts/fullsdk/platforms/android-30" path="prebuilts/fullsdk-darwin/platforms/android-30" revision="03d553bc2b9890601943a4e04e02202337eb1af7">
<linkfile dest="prebuilts/fullsdk-linux/platforms/android-30" src="." />
</project>
<project
path="prebuilts/fullsdk-darwin/sources/android-29"
name="platform/prebuilts/fullsdk/sources/android-29"
revision="master"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-29" />
<project clone-depth="1" name="platform/prebuilts/fullsdk/sources/android-30" path="prebuilts/fullsdk-darwin/sources/android-30" revision="de53a04b553b721f937d6d9dcbe8ab0dee7fc23f">
<linkfile dest="prebuilts/fullsdk-linux/sources/android-30" src="." />
</project>
<project
path="prebuilts/fullsdk-darwin/ndk"
name="toolchain/prebuilts/ndk/r20"
revision="master"
groups="pdk"
clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/ndk" />
<project clone-depth="1" groups="pdk" name="toolchain/prebuilts/ndk/r21" path="prebuilts/fullsdk-darwin/ndk" revision="01c46f37e7a0ce88be386708d2a911b5e3505e79">
<linkfile dest="prebuilts/fullsdk-linux/ndk" src="." />
</project>
<!-- SDK dependencies (darwin) -->
<!-- Config: shallow + master revision -->
<project
path="prebuilts/fullsdk-darwin/build-tools/28.0.3"
name="platform/prebuilts/fullsdk-darwin/build-tools/28.0.3"
revision="master"
clone-depth="1"
groups="notdefault,platform-darwin" />
<project
path="prebuilts/fullsdk-darwin/build-tools/29.0.0"
name="platform/prebuilts/fullsdk-darwin/build-tools/29.0.0"
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"
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" />
<!-- SDK dependencies (linux) -->
<!-- Config: shallow + master revision -->
<project
path="prebuilts/fullsdk-linux/build-tools/28.0.3"
name="platform/prebuilts/fullsdk-linux/build-tools/28.0.3"
revision="master"
clone-depth="1"
groups="notdefault,platform-linux" />
<project
path="prebuilts/fullsdk-linux/build-tools/29.0.0"
name="platform/prebuilts/fullsdk-linux/build-tools/29.0.0"
revision="master"
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" />
<project
path="prebuilts/jdk/jdk8"
name="platform/prebuilts/jdk/jdk8"
revision="androidx-master-dev"
groups="pdk"
clone-depth="1" />
<project
path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86"
revision="master"
groups="notdefault,platform-linux"
clone-depth="1" />
<!-- END dependencies -->
<!-- BEGIN target project -->
<project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" />
<!-- END target project -->
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
<project clone-depth="1" groups="notdefault,platform-darwin" name="platform/prebuilts/fullsdk-darwin/build-tools/29.0.3" path="prebuilts/fullsdk-darwin/build-tools/29.0.3" revision="f597735774e931d682fb10e0d0590392f4a69c38" />
<project clone-depth="1" groups="notdefault,platform-darwin" name="platform/prebuilts/fullsdk-darwin/platform-tools" path="prebuilts/fullsdk-darwin/platform-tools" revision="062713a08b2824062a3cdffa57ec79ed2ea87fe2" />
<project clone-depth="1" groups="notdefault,platform-darwin" name="platform/prebuilts/fullsdk-darwin/tools" path="prebuilts/fullsdk-darwin/tools" revision="204b8813ffedef10214a4afe04c843f1ee9e4fe7" />
<project clone-depth="1" groups="notdefault,platform-darwin" name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/fullsdk-darwin/cmake" revision="fc59035d8c856055f2a263dc8a2f9de96c959cc2" />
<project clone-depth="1" groups="notdefault,platform-linux" name="platform/prebuilts/fullsdk-linux/build-tools/29.0.3" path="prebuilts/fullsdk-linux/build-tools/29.0.3" revision="2d89707a7cc994d40bd4c20b3cb42cf5a87e983a" />
<project clone-depth="1" groups="notdefault,platform-linux" name="platform/prebuilts/fullsdk-linux/platform-tools" path="prebuilts/fullsdk-linux/platform-tools" revision="4512b19ea9a410c64f740de3efcdfcdded07948a" />
<project clone-depth="1" groups="notdefault,platform-linux" name="platform/prebuilts/fullsdk-linux/tools" path="prebuilts/fullsdk-linux/tools" revision="2d5e66a40bd1e6d43ee458efea6f1dd5d5166a59" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="fe743aa0d39ef9bab51c612a957acdd4588d069c" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="d40e0b4cee3e2c2bf79d3d98a287bb5ee1ced30e" />
<project clone-depth="1" groups="notdefault,platform-linux" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/fullsdk-linux/cmake" revision="de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1" />
<project clone-depth="1" groups="pdk" name="platform/frameworks/support-golden" path="golden" revision="56db9e2cfab08e4c531e2a64e14ae7aa0f534b5b" />
<project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" revision="10300248eb75384a416083b8a5af996aa88b5dce" />
<repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks" />
</manifest>