Merge "Output of an apex module type can be included in tests"

am: 08e047fdc6

Change-Id: I936348c7787795e44c099e8d176c578d3a70e4c9
This commit is contained in:
Jiyong Park 2018-12-12 04:40:23 -08:00 committed by android-build-merger
commit 445033ddfc

View file

@ -457,6 +457,10 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
} }
func (a *apexBundle) Srcs() android.Paths {
return android.Paths{a.outputFiles[imageApex]}
}
func getCopyManifestForNativeLibrary(cc *cc.Module) (fileToCopy android.Path, dirInApex string) { func getCopyManifestForNativeLibrary(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {
// Decide the APEX-local directory by the multilib of the library // Decide the APEX-local directory by the multilib of the library
// In the future, we may query this to the module. // In the future, we may query this to the module.