Merge "VNDK snapshot modules must have vndk subdirectory" (d40471c7) · Commits · e / os / android_build_soong

cc/vndk_prebuilt.go

+4 −6

Original line number	Diff line number	Diff line
		@@ -111,13 +111,11 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext,

		func (p *vndkPrebuiltLibraryDecorator) install(ctx ModuleContext, file android.Path) {
		if p.shared() {
		if ctx.Device() && ctx.useVndk() {
		if ctx.isVndkSp() {
		p.baseInstaller.subDir = "vndk-sp-" + p.version()
		} else if ctx.isVndk() {
		p.baseInstaller.subDir = "vndk-" + p.version()
		}
		}
		p.baseInstaller.install(ctx, file)
		}
		}