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

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

Merge "Remove dependency from vendor_snapshot to each module"

parents 8e792689 4813867e

cc/snapshot_prebuilt.go

+5 −14
Original line number Diff line number Diff line
@@ -284,23 +284,14 @@ func (s *snapshot) DepsMutator(ctx android.BottomUpMutatorContext) { 
	collectSnapshotMap := func(variations []blueprint.Variation, depTag blueprint.DependencyTag,

		names []string, snapshotSuffix, moduleSuffix string) map[string]string {



		decoratedNames := make([]string, 0, len(names))

		snapshotMap := make(map[string]string)

		for _, name := range names {

			decoratedNames = append(decoratedNames, name+

			snapshotMap[name] = name +

				snapshotSuffix + moduleSuffix +

				s.baseSnapshot.version() +

				"."+ctx.Arch().ArchType.Name)

				"." + ctx.Arch().ArchType.Name

		}



		deps := ctx.AddVariationDependencies(variations, depTag, decoratedNames...)

		snapshotMap := make(map[string]string)

		for _, dep := range deps {

			if dep == nil {

				continue

			}



			snapshotMap[dep.(*Module).BaseModuleName()] = ctx.OtherModuleName(dep)

		}

		return snapshotMap

	}

cc/vendor_snapshot_test.go

+5 −0
Original line number Diff line number Diff line
@@ -416,7 +416,12 @@ func TestVendorSnapshotUse(t *testing.T) { 
		name: "libvendor",

		version: "BOARD",

		target_arch: "arm64",

		compile_multilib: "64",

		vendor: true,

		shared_libs: [

			"libvendor_without_snapshot",

			"libvendor_available",

		],

		arch: {

			arm64: {

				src: "libvendor.so",