Merge "Require that NDK symbol files end with .map.txt." am: 2a60959b65

am: 79a9014c9b

Change-Id: Ic1f74682754f17fc1bf6166729c0eb7f3e4da270
This commit is contained in:
Dan Albert 2017-06-14 00:38:05 +00:00 committed by android-build-merger
commit ec0acf308f

View file

@ -281,6 +281,10 @@ func compileStubLibrary(ctx ModuleContext, flags Flags, symbolFile, apiLevel, vn
} }
func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects { func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {
if !strings.HasSuffix(c.properties.Symbol_file, ".map.txt") {
ctx.PropertyErrorf("symbol_file", "must end with .map.txt")
}
objs, versionScript := compileStubLibrary(ctx, flags, c.properties.Symbol_file, c.properties.ApiLevel, "") objs, versionScript := compileStubLibrary(ctx, flags, c.properties.Symbol_file, c.properties.ApiLevel, "")
c.versionScriptPath = versionScript c.versionScriptPath = versionScript
return objs return objs