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

Commit 27b95724 authored by Justin Yun's avatar Justin Yun
Browse files

Rewrite snapshot dependencies for vndk-ext 

VNDK-ext libraries have dependency on VNDK libraries. When building
against snapshots, the dependency must be rewritten with the
snapshots.

Bug: 194864314
Test: m nothing
Change-Id: I1244c6a6590e89b344ab39514bb5142d36b04268
parent d7b95f94

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) { 
			actx.AddVariationDependencies([]blueprint.Variation{

				c.ImageVariation(),

				{Mutator: "link", Variation: "shared"},

			}, vndkExtDepTag, vndkdep.getVndkExtendsModuleName())

			}, vndkExtDepTag, RewriteSnapshotLib(vndkdep.getVndkExtendsModuleName(), GetSnapshot(c, &snapshotInfo, actx).SharedLibs))

		}

	}

}

cc/vendor_snapshot_test.go

+13 −0
Original line number Diff line number Diff line
@@ -459,6 +459,19 @@ func TestVendorSnapshotUse(t *testing.T) { 
		srcs: ["client.cpp"],

	}



	cc_library_shared {

		name: "libvndkext",

		vendor: true,

		nocrt: true,

		no_libcrt: true,

		stl: "none",

		system_shared_libs: [],

		vndk: {

			extends: "libvndk",

			enabled: true,

		}

	}



	cc_binary {

		name: "bin_without_snapshot",

		vendor: true,