Compare commits

...

12 Commits

Author SHA1 Message Date
Aurimas Liutikas
da9f83fafc Add build-tools/30.0.2 project
Test: None, empty new project
Change-Id: I91da9abce67a4c40fc2faccea241e907daae0e86
2020-09-23 16:21:17 +00:00
Oussama Ben Abdelbaki
dc5adc59b2 Remove sdk 29 from manifest.
Bug: 156949239
Change-Id: I2e53ebd9ea4526bb852b702c703a216a8aa37bae
2020-08-27 22:17:53 +00:00
Nate Fischer
c2043c4aee [AndroidX Webkit] roll boundary interfaces to 021571f
This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
5d6acc31bd..021571f9ab

Bug: 161947908
Test: N/A
Change-Id: Ic22fca7c086e78be13ad6fe0dd16dcdd1933338e
2020-07-29 22:35:17 +00:00
Shimi Zhang
25fa947b4c [AndroidX Webkit] roll boundary interfaces to 5d6acc3
This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
2bb4bf6775..5d6acc31bd

Test: N/A
Change-Id: I16fbe6ff546ebac3b4eb952d4efa95b966f00ae5
2020-07-23 17:19:23 -07:00
Andrea Falcone
a92bced0cc Use the separate prebuilt for Darwin ndk
BUG: 159916003

Change-Id: I2d60a029146fed6a106c0f24fa3d47fc3fd28168
2020-07-23 13:08:52 -04:00
Andrea Falcone
ad8993003e Update to ndk r21
Change-Id: I168b166c51328c78bd2672b4b0f9870f1d43a7f2
2020-07-10 11:41:16 -04:00
Aurimas Liutikas
2983608127 Add platfrom/manifest to the manifest
While this is very meta, this allows for an easy way to make manifest
changes locally and still use `repo upload`.

Test: local modification to .repo/manifests/default.xml
Change-Id: If5162ac8a3627be2ecf893baa750eadf4bbb277a
2020-07-01 16:41:41 -07:00
Shimi Zhang
71350b966c [AndroidX Webkit] roll boundary interfaces to 2bb4bf6
This rolls the boundary interfaces for the androidx.webkit module
to include the following commit range:
396142f05d..2bb4bf6775

Test: N/A
Change-Id: I80307627224ab45ff46f5abbe3b57cfa4f4ccc14
2020-06-24 20:53:29 +00:00
Jeff Gaston
e8081cbf13 Revert "Pinning jdk11 to previous version"
This reverts commit ca0fe140e5.

Reason for revert: May not have been necessary; now we're trying the newer version again

Change-Id: Id807f6776017e9c0059fb69358d72411421ce71e
2020-06-16 18:11:05 -04:00
Aurimas Liutikas
1292aa1b1e Remove unused prebuilts/ktlint project from the manifest
We have migrated to using ktlint through maven prebuilts and no
longer need this repository

Change-Id: Ia4e51104d2071e4b997b69805bf0f05438b62cb0
2020-06-12 22:28:26 +00:00
Alan Viverette
51c16f1b4f Update fullsdk projects
Bug: 157027847
Test: n/a
Change-Id: Ib0d00187e93796a244bd923ce80c3f6f44dc420f
2020-06-09 17:09:52 +00:00
Alexander Dorokhine
18bf22f138 Update protobuf prebuilts and source branch.
We add the protobuf 'prebuilts' repo which contains the officially
released protoc compiler, and switch both branches to the
'androidx-master-dev' branch which will contain the officially released
source code matching that compiler.

This is required to build the C++ proto lib in Jetpack with the source
code that exactly matches the protoc binary.

Bug: 157512302
Change-Id: I40b780296903ae660e6b6dbd94302e030c5b9c71
2020-06-03 10:42:39 -07:00

View File

@@ -8,22 +8,25 @@
sync-j="8" /> sync-j="8" />
<!-- BEGIN dependencies --> <!-- BEGIN dependencies -->
<project path="build/make" name="platform/build" /> <project path="build/make" name="platform/build" />
<project path="manifest" name="platform/manifest" />
<!-- External dependencies --> <!-- External dependencies -->
<!-- Config: shallow + same revision --> <!-- Config: shallow + same revision -->
<project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" clone-depth="1" /> <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" clone-depth="1" />
<project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" groups="pdk" clone-depth="1" revision="396142f05ddfe58f34ab19297bfa507544d85acd" /> <project path="external/webview_support_interfaces" name="platform/external/webview_support_interfaces" groups="pdk" clone-depth="1" revision="021571f9ab2fb3cf7c162fa43f2a6329dcda89b4" />
<project path="external/doclava" name="platform/external/doclava" groups="pdk" clone-depth="1" revision="master" /> <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="external/dokka" name="platform/external/dokka" groups="pdk" clone-depth="1" revision="master" />
<project path="external/icing" name="platform/external/icing" groups="pdk" /> <project path="external/icing" name="platform/external/icing" groups="pdk" />
<project path="external/icu" name="platform/external/icu" groups="pdk" clone-depth="1" revision="master" /> <project path="external/icu" name="platform/external/icu" groups="pdk" clone-depth="1" revision="master" />
<project path="external/protobuf" name="platform/external/protobuf" groups="pdk" clone-depth="1" revision="master" /> <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
<project path="external/protobuf" name="platform/external/protobuf" groups="pdk" clone-depth="1" revision="androidx-master-dev" />
<project path="prebuilts/androidx/external" name="platform/prebuilts/androidx/external" groups="pdk" clone-depth="1" /> <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/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/exoplayer" name="platform/prebuilts/androidx/exoplayer" groups="pdk" clone-depth="1" />
<!-- Tools dependencies --> <!-- Tools dependencies -->
<!-- Config: shallow + master revision --> <!-- Config: shallow + master revision -->
<project path="prebuilts/checkstyle" name="platform/prebuilts/checkstyle" groups="pdk-fs" clone-depth="1" revision="master" /> <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" /> <!-- The contents of external/protobuf must be kept in sync with the contents of prebuilts/protobuf -->
<project path="prebuilts/protobuf" name="platform/prebuilts/protobuf" groups="pdk-fs" clone-depth="1" revision="androidx-master-dev" />
<project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" revision="master" /> <project path="tools/repohooks" name="platform/tools/repohooks" groups="adt-infra,cts,eclipse,motodev,pdk,tools,tradefed" revision="master" />
<!-- Gradle dependencies --> <!-- Gradle dependencies -->
<!-- Config: shallow --> <!-- Config: shallow -->
@@ -31,26 +34,32 @@
<!-- SDK dependencies (shared) --> <!-- SDK dependencies (shared) -->
<!-- Config: shallow + master revision --> <!-- Config: shallow + master revision -->
<project <project
path="prebuilts/fullsdk-darwin/platforms/android-29" path="prebuilts/fullsdk-darwin/platforms/android-30"
name="platform/prebuilts/fullsdk/platforms/android-29" name="platform/prebuilts/fullsdk/platforms/android-30"
revision="master" revision="master"
clone-depth="1"> clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-29" /> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-30" />
</project> </project>
<project <project
path="prebuilts/fullsdk-darwin/sources/android-29" path="prebuilts/fullsdk-darwin/sources/android-30"
name="platform/prebuilts/fullsdk/sources/android-29" name="platform/prebuilts/fullsdk/sources/android-30"
revision="master" revision="master"
clone-depth="1"> clone-depth="1">
<linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-29" /> <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-30" />
</project> </project>
<project <project
path="prebuilts/fullsdk-darwin/ndk" path="prebuilts/fullsdk-darwin/ndk"
name="toolchain/prebuilts/ndk/r20" name="toolchain/prebuilts/ndk-darwin/r21"
revision="master" revision="master"
groups="pdk" clone-depth="1"
clone-depth="1"> groups="notdefault,platform-darwin">
<linkfile src="." dest="prebuilts/fullsdk-linux/ndk" /> </project>
<project
path="prebuilts/fullsdk-linux/ndk"
name="toolchain/prebuilts/ndk/r21"
revision="master"
clone-depth="1"
groups="notdefault,platform-linux">
</project> </project>
<!-- SDK dependencies (darwin) --> <!-- SDK dependencies (darwin) -->
<!-- Config: shallow + master revision --> <!-- Config: shallow + master revision -->
@@ -60,6 +69,12 @@
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-darwin" /> groups="notdefault,platform-darwin" />
<project
path="prebuilts/fullsdk-darwin/build-tools/30.0.2"
name="platform/prebuilts/fullsdk-darwin/build-tools/30.0.2"
revision="master"
clone-depth="1"
groups="notdefault,platform-darwin" />
<project <project
path="prebuilts/fullsdk-darwin/platform-tools" path="prebuilts/fullsdk-darwin/platform-tools"
name="platform/prebuilts/fullsdk-darwin/platform-tools" name="platform/prebuilts/fullsdk-darwin/platform-tools"
@@ -86,6 +101,12 @@
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-linux" /> groups="notdefault,platform-linux" />
<project
path="prebuilts/fullsdk-linux/build-tools/30.0.2"
name="platform/prebuilts/fullsdk-linux/build-tools/30.0.2"
revision="master"
clone-depth="1"
groups="notdefault,platform-linux" />
<project <project
path="prebuilts/fullsdk-linux/platform-tools" path="prebuilts/fullsdk-linux/platform-tools"
name="platform/prebuilts/fullsdk-linux/platform-tools" name="platform/prebuilts/fullsdk-linux/platform-tools"
@@ -107,7 +128,7 @@
<project <project
path="prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11"
name="platform/prebuilts/jdk/jdk11" name="platform/prebuilts/jdk/jdk11"
revision="bbeda2d62c42637bc218e5de0fc3471bfd0cf5c0" revision="master"
groups="pdk" groups="pdk"
clone-depth="1" /> clone-depth="1" />
<project <project