Merge "apex: dedup jni_libs when generating apex_manifest"
This commit is contained in:
@@ -193,7 +193,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs,
|
|||||||
// collect jniLibs. Notice that a.filesInfo is already sorted
|
// collect jniLibs. Notice that a.filesInfo is already sorted
|
||||||
var jniLibs []string
|
var jniLibs []string
|
||||||
for _, fi := range a.filesInfo {
|
for _, fi := range a.filesInfo {
|
||||||
if fi.isJniLib {
|
if fi.isJniLib && !android.InList(fi.Stem(), jniLibs) {
|
||||||
jniLibs = append(jniLibs, fi.Stem())
|
jniLibs = append(jniLibs, fi.Stem())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user