Compare commits

...

30 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
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

@@ -8,73 +8,70 @@
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" revision="master" /> <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="77b0f946f298d56f1b6d7e3b13d27c06f363714b" /> <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/icu" name="platform/external/icu" 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" />
<project path="prebuilts/androidx/studio" name="platform/prebuilts/androidx/studio" 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 + specific revision --> <!-- Config: shallow -->
<project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" revision="6.0" clone-depth="1" /> <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="tools" clone-depth="1" />
<!-- SDK dependencies (shared) --> <!-- SDK dependencies (shared) -->
<!-- Config: shallow + master revision --> <!-- Config: shallow + master revision -->
<project <project
path="prebuilts/fullsdk-darwin/platforms/android-28" path="prebuilts/fullsdk-darwin/platforms/android-30"
name="platform/prebuilts/fullsdk/platforms/android-28" 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-28" /> <linkfile src="." dest="prebuilts/fullsdk-linux/platforms/android-30" />
</project> </project>
<project <project
path="prebuilts/fullsdk-darwin/platforms/android-29" path="prebuilts/fullsdk-darwin/sources/android-30"
name="platform/prebuilts/fullsdk/platforms/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/platforms/android-29" /> <linkfile src="." dest="prebuilts/fullsdk-linux/sources/android-30" />
</project> </project>
<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>
<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>
<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 -->
<project <project
path="prebuilts/fullsdk-darwin/build-tools/28.0.3" path="prebuilts/fullsdk-darwin/build-tools/29.0.3"
name="platform/prebuilts/fullsdk-darwin/build-tools/28.0.3" name="platform/prebuilts/fullsdk-darwin/build-tools/29.0.3"
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-darwin" /> groups="notdefault,platform-darwin" />
<project <project
path="prebuilts/fullsdk-darwin/build-tools/29.0.0" path="prebuilts/fullsdk-darwin/build-tools/30.0.2"
name="platform/prebuilts/fullsdk-darwin/build-tools/29.0.0" name="platform/prebuilts/fullsdk-darwin/build-tools/30.0.2"
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-darwin" /> groups="notdefault,platform-darwin" />
@@ -93,20 +90,20 @@
<project <project
path="prebuilts/fullsdk-darwin/cmake" path="prebuilts/fullsdk-darwin/cmake"
name="platform/prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86"
revision="master" revision="fc59035d8c856055f2a263dc8a2f9de96c959cc2"
groups="notdefault,platform-darwin" groups="notdefault,platform-darwin"
clone-depth="1" /> clone-depth="1" />
<!-- SDK dependencies (linux) --> <!-- SDK dependencies (linux) -->
<!-- Config: shallow + master revision --> <!-- Config: shallow + master revision -->
<project <project
path="prebuilts/fullsdk-linux/build-tools/28.0.3" path="prebuilts/fullsdk-linux/build-tools/29.0.3"
name="platform/prebuilts/fullsdk-linux/build-tools/28.0.3" name="platform/prebuilts/fullsdk-linux/build-tools/29.0.3"
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-linux" /> groups="notdefault,platform-linux" />
<project <project
path="prebuilts/fullsdk-linux/build-tools/29.0.0" path="prebuilts/fullsdk-linux/build-tools/30.0.2"
name="platform/prebuilts/fullsdk-linux/build-tools/29.0.0" name="platform/prebuilts/fullsdk-linux/build-tools/30.0.2"
revision="master" revision="master"
clone-depth="1" clone-depth="1"
groups="notdefault,platform-linux" /> groups="notdefault,platform-linux" />
@@ -128,12 +125,20 @@
revision="androidx-master-dev" revision="androidx-master-dev"
groups="pdk" groups="pdk"
clone-depth="1" /> clone-depth="1" />
<project
path="prebuilts/jdk/jdk11"
name="platform/prebuilts/jdk/jdk11"
revision="master"
groups="pdk"
clone-depth="1" />
<project <project
path="prebuilts/fullsdk-linux/cmake" path="prebuilts/fullsdk-linux/cmake"
name="platform/prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86"
revision="master" revision="de5fa1c66d3bdcbf2bbc62d2504ec6b0b0fb74e1"
groups="notdefault,platform-linux" groups="notdefault,platform-linux"
clone-depth="1" /> clone-depth="1" />
<!-- Golden images -->
<project path="golden" name="platform/frameworks/support-golden" groups="pdk" clone-depth="1" />
<!-- END dependencies --> <!-- END dependencies -->
<!-- BEGIN target project --> <!-- BEGIN target project -->
<project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" /> <project path="frameworks/support" name="platform/frameworks/support" groups="pdk-cw-fs,pdk-fs" />