Merge "Ensure that stubs.symbol_file has ".map.txt" suffix"
This commit is contained in:
commit
509ab03f12
|
@ -648,6 +648,11 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
|
||||||
return objs
|
return objs
|
||||||
}
|
}
|
||||||
if library.buildStubs() {
|
if library.buildStubs() {
|
||||||
|
symbolFile := String(library.Properties.Stubs.Symbol_file)
|
||||||
|
if symbolFile != "" && !strings.HasSuffix(symbolFile, ".map.txt") {
|
||||||
|
ctx.PropertyErrorf("symbol_file", "%q doesn't have .map.txt suffix", symbolFile)
|
||||||
|
return Objects{}
|
||||||
|
}
|
||||||
objs, versionScript := compileStubLibrary(ctx, flags, String(library.Properties.Stubs.Symbol_file), library.MutatedProperties.StubsVersion, "--apex")
|
objs, versionScript := compileStubLibrary(ctx, flags, String(library.Properties.Stubs.Symbol_file), library.MutatedProperties.StubsVersion, "--apex")
|
||||||
library.versionScriptPath = android.OptionalPathForPath(versionScript)
|
library.versionScriptPath = android.OptionalPathForPath(versionScript)
|
||||||
return objs
|
return objs
|
||||||
|
|
Loading…
Reference in New Issue