diff options
| author | Yigit Boyar <yboyar@google.com> | 2018-09-19 19:03:35 -0700 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2018-09-24 14:29:39 +0000 |
| commit | 007714939a839fe6b0d08c2e780d5ed7e9e13223 (patch) | |
| tree | f476cc66425b017698b9b4d584d636e7b2a6e380 /compiler/src/main/kotlin/android/databinding | |
| parent | 13f1f0b2702637a8be9f320da6662a312b482346 (diff) | |
| download | data-binding-007714939a839fe6b0d08c2e780d5ed7e9e13223.tar.gz | |
Use qualified R for included layouts
An included layout might be coming from a dependency and if that
dependency is a feature (base feature), we need to use the correct
R.layout file. This will also be necessary with namespaced
resources.
Bug:112042862
Test: InstantApp integration test
Change-Id: Iaaf99ab7a9f7ac03757cdea19c8ddc111505d9ed
Diffstat (limited to 'compiler/src/main/kotlin/android/databinding')
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt | 6 |
1 files changed, 4 insertions, 2 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 3581aaf6..a8e2f5ec 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt @@ -473,8 +473,10 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder, val libTypes: LibTypes }},") tab("new int[] {${ includeMap[it]!!.map { - "R.layout.${it.includedLayout}" - }.joinToString(", ") + (it.includedLayoutPackage ?: layoutBinder.modulePackage).let { pkg -> + "$pkg.R.layout.${it.includedLayout}" + } + }.joinToString(",\n ") }});") } } |