aboutsummaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorJaewoong Jung <jungjw@google.com>2019-06-11 12:25:34 -0700
committerRashed Abdel-Tawab <rashed@linux.com>2019-09-27 20:31:00 -0700
commit7d5ac0d1fe82479e7b1b9944693605428c04f0be (patch)
tree9ec0be0a3e18e57fc291cd3d8ebc1fdd700b9655 /apex
parent9fc8a40ac246762a1fa2c36f51cd46ff12a934bc (diff)
downloadbuild_soong-7d5ac0d1fe82479e7b1b9944693605428c04f0be.tar.gz
build_soong-7d5ac0d1fe82479e7b1b9944693605428c04f0be.tar.bz2
build_soong-7d5ac0d1fe82479e7b1b9944693605428c04f0be.zip
Improve android_app_import.dpi_variants handling.
Instead of circumventing the limitation of Prebuilt implementation by picking a source path itself, it now uses the same mechanism as archMutator and replaces the source path in advance so that Prebuilt always sees the corrent source path. Because this requires the Apk field to be a string pointer, the single source prebuilt implementation is being updated to be reflection-based. Test: Soong unit tests, m soong_docs, TreeHugger Change-Id: I2304f15e32d632f74f95f0d9e9bf1f75ff3e2225
Diffstat (limited to 'apex')
-rw-r--r--apex/apex.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 87c54f3b..94e871cb 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1429,7 +1429,7 @@ func (p *Prebuilt) AndroidMk() android.AndroidMkData {
func PrebuiltFactory() android.Module {
module := &Prebuilt{}
module.AddProperties(&module.properties)
- android.InitSingleSourcePrebuiltModule(module, &module.properties.Source)
+ android.InitSingleSourcePrebuiltModule(module, &module.properties, "Source")
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
return module
}