Revert "[Hybrid build] data-binding is built with bazel"
Revert submission 16085771-bazel_databinding
Reason for revert: Breaks androidx integration branch as
the gradle build that builds the data binding runtime was
also removed.
Reverted Changes:
Id2adb5662:[Hybrid build] data binding is built with bazel
Ib89cdb17b:[Hybrid build] data-binding is built with bazel
I38979ba2b:[Hybrid build] data binding is built with bazel
Change-Id: I20142902ab98f8054464d231b58527759f442137
diff --git a/base/dependencies.properties b/base/dependencies.properties
index 691dabd..2a45c88 100644
--- a/base/dependencies.properties
+++ b/base/dependencies.properties
@@ -29,9 +29,6 @@
bouncycastle_pkix = org.bouncycastle:bcpkix-jdk15on:1.56
bouncycastle_prov = org.bouncycastle:bcprov-jdk15on:1.56
bundle_tool = com.android.tools.build:bundletool:1.8.0
-androidx_databinding_databinding_compiler_common = androidx.databinding:databinding-compiler-common:buildVersion
-androidx_databinding_databinding_common = androidx.databinding:databinding-common:buildVersion
-com_android_databinding_baseLibrary = com.android.databinding:baseLibrary:buildVersion
com_android_tools_annotations = com.android.tools:annotations:baseVersion
com_android_tools_common = com.android.tools:common:baseVersion
com_android_tools_analyticsLibrary_crash = com.android.tools.analytics-library:crash:baseVersion
diff --git a/base/settings-real.gradle b/base/settings-real.gradle
index ae65ef9..7fcd17b 100644
--- a/base/settings-real.gradle
+++ b/base/settings-real.gradle
@@ -61,6 +61,18 @@
include ':external:fat32lib'
+include ':dataBinding'
+project(':dataBinding').projectDir = new File(rootDir, "data-binding")
+include ':dataBinding:baseLibrary'
+project(':dataBinding:baseLibrary').projectDir = new File(rootDir, "data-binding/baseLibrary")
+include ':dataBinding:baseLibrarySupport'
+project(':dataBinding:baseLibrarySupport').projectDir = new File(rootDir, "data-binding/baseLibrarySupport")
+include ':dataBinding:compiler'
+project(':dataBinding:compiler').projectDir = new File(rootDir, "data-binding/compiler")
+include ':dataBinding:compilerCommon'
+project(':dataBinding:compilerCommon').projectDir = new File(rootDir, "data-binding/compilerCommon")
+
+
include ':base:zipflinger'
include ':base:signflinger'
