diff options
| author | George Mount <mount@google.com> | 2017-04-04 07:58:12 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2017-04-04 07:58:12 -0700 |
| commit | 104abe3501f5eefc1f2866547a1dbf6f77c7d5f5 (patch) | |
| tree | e7c91af4a060e4c6a09231e2da6ffa636af08fcb /compiler/src/main/kotlin/android/databinding | |
| parent | f29782a7ab5d2fbce29392aa307010b21246214d (diff) | |
| download | data-binding-104abe3501f5eefc1f2866547a1dbf6f77c7d5f5.tar.gz | |
Fix merge tags used in multi-layout configurations.
Bug 36882546
When merge tags are used in multi-layout configurations,
the super() call arguments was being confused with the this()
call arguments causing compilation failure.
Test: ran TestApp tests.
Change-Id: Ibfc700be6274c3ec4b9bb394ebcbfd0df3a23627
Diffstat (limited to 'compiler/src/main/kotlin/android/databinding')
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt index c7863807..4de90a02 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt @@ -513,7 +513,7 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) { if (layoutBinder.hasVariations()) { nl("") nl("public $className(@Nullable android.databinding.DataBindingComponent bindingComponent, @NonNull $parameterType root) {") { - tab("this(bindingComponent, $superParam, mapBindings(bindingComponent, root, $bindingCount, sIncludes, sViewsWithIds));") + tab("this(bindingComponent, root, mapBindings(bindingComponent, root, $bindingCount, sIncludes, sViewsWithIds));") } nl("}") nl("private $className(android.databinding.DataBindingComponent bindingComponent, $parameterType root, Object[] bindings) {") { |