Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e145e4c0 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "apex: dedup jni_libs when generating apex_manifest" am: dcbb66f8 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1413429

Change-Id: I683dc2938b3f9bdc0bd155ad457564b48438de5f
parents eb285d43 dcbb66f8

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
	// collect jniLibs. Notice that a.filesInfo is already sorted

	var jniLibs []string

	for _, fi := range a.filesInfo {

		if fi.isJniLib {

		if fi.isJniLib && !android.InList(fi.Stem(), jniLibs) {

			jniLibs = append(jniLibs, fi.Stem())

		}

	}