Properly package aconfig files for vendor partition
Bug: 311173471
Test: Unit tests
Change-Id: Ibb857b69c3f83326a9ff5732e11dd09887e4ba6e
diff --git a/rust/androidmk.go b/rust/androidmk.go
index 733ffc5..c355a56 100644
--- a/rust/androidmk.go
+++ b/rust/androidmk.go
@@ -17,6 +17,7 @@
import (
"path/filepath"
+ "android/soong/aconfig"
"android/soong/android"
)
@@ -66,8 +67,7 @@
if mod.UseVndk() {
entries.SetBool("LOCAL_USE_VNDK", true)
}
- // TODO(b/311155208): The container here should be system.
- entries.SetPaths("LOCAL_ACONFIG_FILES", mod.mergedAconfigFiles[""])
+ aconfig.SetAconfigFileMkEntries(mod.AndroidModuleBase(), entries, mod.mergedAconfigFiles)
},
},
}