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

Commit f17284e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix: stubs lib is installed in APEX"

parents dddedf2e 67883b3e

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -664,5 +664,5 @@ func TestStaticLinking(t *testing.T) { 
	ldFlags := ctx.ModuleForTests("not_in_apex", "android_arm64_armv8-a_core").Rule("ld").Args["libFlags"]



	// Ensure that not_in_apex is linking with the static variant of mylib

	ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static/mylib.a")

	ensureContains(t, ldFlags, "mylib/android_arm64_armv8-a_core_static_platform/mylib.a")

}

cc/library.go

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ func VersionMutator(mctx android.BottomUpMutatorContext) { 
			stubsVersionsFor(mctx.Config())[mctx.ModuleName()] = copiedVersions



			// "" is for the non-stubs variant

			versions = append(versions, "")

			versions = append([]string{""}, versions...)



			modules := mctx.CreateVariations(versions...)

			for i, m := range modules {