Import Constraint Layout X from local Maven ZIP am: af9a67f50d

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/sdk/+/11916197

Change-Id: I1c5be58ce80fc2b4d5ecb4574ff57edef9236e58

22 files changed, 30 insertions, 13 deletions

diff --git a/current/extras/constraint-layout-x/Android.bp b/current/extras/constraint-layout-x/Android.bp
index 9672a4e59..8e7fb6842 100644
--- a/current/extras/constraint-layout-x/Android.bp
+++ b/current/extras/constraint-layout-x/Android.bp
@@ -3,13 +3,22 @@
 
 java_import {
     name: "androidx-constraintlayout_constraintlayout-solver-nodeps",
-    jars: ["constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar"],
+    jars: ["constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar"],
     sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
 
 java_library_static {
     name: "androidx-constraintlayout_constraintlayout-solver",
     sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    min_sdk_version: "24",
     static_libs: [
         "androidx-constraintlayout_constraintlayout-solver-nodeps",
     ],
@@ -18,8 +27,12 @@ java_library_static {
 
 android_library_import {
     name: "androidx-constraintlayout_constraintlayout-nodeps",
-    aars: ["constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar"],
+    aars: ["constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar"],
     sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
     min_sdk_version: "14",
     static_libs: [
         "androidx.appcompat_appcompat",
@@ -31,6 +44,10 @@ android_library_import {
 android_library {
     name: "androidx-constraintlayout_constraintlayout",
     sdk_version: "current",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
     min_sdk_version: "14",
     manifest: "manifests/androidx-constraintlayout_constraintlayout/AndroidManifest.xml",
     static_libs: [
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.md5
deleted file mode 100644
index 46a5ea6e9..000000000
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-dfffed54badcd8a91aa1eb9488745faa
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.sha1
deleted file mode 100644
index f2643fd78..000000000
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ba7ef690b7c615f782090e770682fbcdc48ea7a5
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.md5
deleted file mode 100644
index 09018b2cf..000000000
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-a373f1bb1c9e2abe64a6bcb265241662
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.sha1
deleted file mode 100644
index 36c570a28..000000000
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-603b16a67ecd899eb946491a84f5fcc91baaec44
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar
index e3cdf3c3e..00d20c528 100644
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.jar
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.md5
new file mode 100644
index 000000000..8a496b90d
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.md5
@@ -0,0 +1 @@
+b0cba34c1dc386464d918e2493770833
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.sha1
new file mode 100644
index 000000000..c274e515a
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.jar.sha1
@@ -0,0 +1 @@
+3bcef826a5dd45ffcb47d32042ece40dd90a598f
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom
index e95554346..9881f0ea6 100644
--- a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta5/constraintlayout-solver-2.0.0-beta5.pom
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.constraintlayout</groupId>
   <artifactId>constraintlayout-solver</artifactId>
-  <version>2.0.0-beta5</version>
+  <version>2.0.0-beta7</version>
   <name>Android ConstraintLayout Solver</name>
   <description>Solver for ConstraintLayout</description>
   <url>http://tools.android.com</url>
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.md5 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.md5
new file mode 100644
index 000000000..41f6f8960
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.md5
@@ -0,0 +1 @@
+c32384bc879104c897dc6ef0eedd560d
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.sha1
new file mode 100644
index 000000000..92a0ce82b
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout-solver/2.0.0-beta7/constraintlayout-solver-2.0.0-beta7.pom.sha1
@@ -0,0 +1 @@
+5d8fabc36be8b8dfa4f97a54cf65310da3b5142f
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar
deleted file mode 100644
index 2cd097ca3..000000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar
+++ /dev/null
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.md5
deleted file mode 100644
index b9e04209f..000000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-ab7473e1c274ff17a14b87549242e717
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.sha1
deleted file mode 100644
index 561706719..000000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c6db65f9a825cb4ffb006612d00a4280b3cdb0f2
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.md5
deleted file mode 100644
index d3659b448..000000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-800a4d51a80537b9539d07c94e3722be
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.sha1
deleted file mode 100644
index 99e779561..000000000
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-856d185bfec27a3b14aa2d8ed1bf38d502242011
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar
new file mode 100644
index 000000000..3956134a9
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5
new file mode 100644
index 000000000..243bcca73
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.md5
@@ -0,0 +1 @@
+841352198d38208068ef37cc6501dece
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1
new file mode 100644
index 000000000..e05d779b4
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.aar.sha1
@@ -0,0 +1 @@
+3b2311a13ef07a384a22607588c535d111a8ae74
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom
index 6b8fa6134..c273a1867 100644
--- a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta5/constraintlayout-2.0.0-beta5.pom
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.constraintlayout</groupId>
   <artifactId>constraintlayout</artifactId>
-  <version>2.0.0-beta5</version>
+  <version>2.0.0-beta7</version>
   <packaging>aar</packaging>
   <name>Android ConstraintLayout</name>
   <description>ConstraintLayout for Android</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>androidx.constraintlayout</groupId>
       <artifactId>constraintlayout-solver</artifactId>
-      <version>2.0.0-beta5</version>
+      <version>2.0.0-beta7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5
new file mode 100644
index 000000000..3d1503dfb
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.md5
@@ -0,0 +1 @@
+e77f92cab139a5e26f3c4d9716c85409
\ No newline at end of file
diff --git a/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1 b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1
new file mode 100644
index 000000000..e5dbed72f
--- /dev/null
+++ b/current/extras/constraint-layout-x/constraintlayout/2.0.0-beta7/constraintlayout-2.0.0-beta7.pom.sha1
@@ -0,0 +1 @@
+7257715c588c812a7c7e174335467bde73620c3a
\ No newline at end of file