Compare commits

...

24 Commits

Author SHA1 Message Date
android-build-prod (mdb)
e269682e66 Pin manifest of androidx-sqlite-inspection-release
Change-Id: I19a1939f67b09c070fb2b3b00950d962490c30da
2020-07-16 20:32:46 +00:00
android-build-prod (mdb)
743c6d406f Pin manifest of androidx-sqlite-inspection-release
Change-Id: I361caaef76478a8db4eb7fe0b506b4f04b539206
2020-07-16 18:19:36 +00:00
android-build-prod (mdb)
3b505b792a Pin manifest of androidx-sqlite-inspection-release
Change-Id: I6d227e35b019f6cbb2e73ed232a9620c0d1020e2
2020-06-29 13:53:39 +00:00
android-build-prod (mdb)
819cc6673e Pin manifest of androidx-sqlite-inspection-release
Change-Id: I9a403f5acea976647d6821b23b3a287700eb682a
2020-06-11 11:52:06 +00:00
android-build-prod (mdb)
e74944d099 Pin manifest of androidx-sqlite-inspection-release
Change-Id: Ib98b87baeb66428504a81e58f96ef3aa46e6e08f
2020-06-03 14:10:07 +00:00
android-build-prod (mdb)
6c63190690 DO NOT MERGE ANYWHERE Create manifest for androidx-sqlite-inspection-release
Change-Id: I85f3f07afa707e69760babeb8e278e429aee2414
BUG: 157984651
2020-06-02 19:54:40 +00:00
Jeff Gaston
ca0fe140e5 Pinning jdk11 to previous version
to see if this makes the camera tests run out of memory less often

Bug: 157663450
Test: treehugger runs frameworks/support/busytown/*.sh
Change-Id: I2f804ed347cbbce07158ed88e1b8093d5525d5d1
2020-06-01 13:01:17 -04:00
Shimi Zhang
5fe1c12c88 [AndroidX Webkit] roll boundary interfaces to 396142f
This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
42cb5981aa..396142f05d

Test: N/A
Change-Id: Ifd3e66ab6136f077f81db01b5a313125f5ac238b
2020-05-04 14:46:31 -07:00
Aurimas Liutikas
e840f38335 Move to a dedicated branch for gradle prebuilts
Test: treehugger, it should work the same
Change-Id: Icd384a84a0bfcae117722fc4a50b43ffacf78caf
2020-04-14 17:15:39 +00:00
Aurimas Liutikas
cef3b50c16 Remove android API 28 sdk from androidx-master-dev checkout.
Change-Id: I3de97a5c6422d1439c0aff206b45f4ee97b44196
Test: None
2020-03-25 21:14:21 +00:00
Aurimas Liutikas
ba5a05b797 Move to a separate branch of external/noto-fonts
In order to prevent us from breaking when changes land in aosp/master
we are moving to a separate branch of noto-fonts.

Change-Id: I0c3480ecfede488d38dddbe9e4521f7f09fad6c3
Test: None, identical branch swap.
2020-03-23 21:20:49 +00:00
Aurimas Liutikas
afccfdfa55 Remove unused studio prebuilts project.
Change-Id: I274ad36bbf1a03f3bfb8fa64532063e52f999cd7
Test: treehugger
2020-03-18 22:57:14 +00:00
Filip Pavlis
ddaf473506 Add goldens project for androidx-master-dev.
Created in b/151081578

Bug: b/129855168
Test: N/A
Change-Id: I71b602d83d4e473504abe6dc757454e2fbf8a31e
2020-03-16 19:23:12 +00:00
Tim Barron
fdd52aeb50 Add external/icu to androidx-master-dev manifest.
Bug: 146766911
Change-Id: I4374558065e449d6bd0ddc7b4886071245446ac6
2020-03-12 18:31:09 -07: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,66 @@
<?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-sqlite-inspection-release" sync-j="8" />
<project name="platform/build" path="build/make" revision="d80d92470fd5551ec2acee77d7e15b4d93a9a520" />
<project clone-depth="1" groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" revision="486f71253fd8dce3156f36f0007c81b4315405a3" />
<project clone-depth="1" groups="pdk" name="platform/external/webview_support_interfaces" path="external/webview_support_interfaces" revision="396142f05ddfe58f34ab19297bfa507544d85acd" />
<project clone-depth="1" groups="pdk" name="platform/external/doclava" path="external/doclava" revision="581b1a2cc5f63f918871328a86eadf05d3f1a675" />
<project clone-depth="1" groups="pdk" name="platform/external/dokka" path="external/dokka" revision="1809b94324138930ae3e730cc88870ddae1bd8df" />
<project groups="pdk" name="platform/external/icing" path="external/icing" revision="8a2e29f30218e861d72616a3dc5d8245954dd59f" />
<project clone-depth="1" groups="pdk" name="platform/external/icu" path="external/icu" revision="7e7c744adb579030a2bcbd03ac8634b6894d3d54" />
<project clone-depth="1" groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="f66b5da2d8d0ab16d9a71b1aec639f781db3af4d" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/androidx/external" path="prebuilts/androidx/external" revision="ff436cda80cdd1127872c8704ef04ea75ea3344d" />
<project clone-depth="1" groups="pdk" name="platform/prebuilts/androidx/internal" path="prebuilts/androidx/internal" revision="775ebddccc08f8db8ff2b2203fe2c5129cffb27a" />
<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="9bb3ec57ad252a8f73683fc37d1d4e5347fd355d" />
<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="bf70aed7478925fb510a3622e16195d699223e4c" />
<project clone-depth="1" groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" revision="729124e65bacd00d091ade1c2fea3fbad2e2c475" />
<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/r20" path="prebuilts/fullsdk-darwin/ndk" revision="090bbcaa361eb158e8bfc5e6950081cb9679e350">
<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" />
</manifest>
<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="0cda6feb6236b585ef085be777a79d197e188f8b" />
<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="ddf834911b293422cb594e6de23271b0802fcdb2" />
<project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" revision="2904a78d3ae16e79871ab1253d82aa52536ed70c" />
<repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks" />
</manifest>