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

Commit 3faa7920 authored by Spandan Das's avatar Spandan Das
Browse files

Use BaseModuleName of dep when writing to make 

Since BaseModuleName of the dep becomes its LOCAL_MODULE name in the
generated mk file, we should also use BaseModuleName of dep for populating
properties such as LOCAL_SHARED_LIBS of rdeps

Test: m nothing --no-skip-soong-tests
Bug: 322175508

Change-Id: I6b47112faa63f85d19b5b71e0e102cea0ab68e3b
parent 50bfc348

cc/cc.go

+2 −2
Original line number Diff line number Diff line
@@ -3361,7 +3361,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
					c.sabi.Properties.ReexportedIncludes, depExporterInfo.IncludeDirs.Strings()...)

			}



			makeLibName := MakeLibName(ctx, c, ccDep, depName) + libDepTag.makeSuffix

			makeLibName := MakeLibName(ctx, c, ccDep, ccDep.BaseModuleName()) + libDepTag.makeSuffix

			switch {

			case libDepTag.header():

				c.Properties.AndroidMkHeaderLibs = append(
@@ -3402,7 +3402,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 
			switch depTag {

			case runtimeDepTag:

				c.Properties.AndroidMkRuntimeLibs = append(

					c.Properties.AndroidMkRuntimeLibs, MakeLibName(ctx, c, ccDep, depName)+libDepTag.makeSuffix)

					c.Properties.AndroidMkRuntimeLibs, MakeLibName(ctx, c, ccDep, ccDep.BaseModuleName())+libDepTag.makeSuffix)

				// Record BaseLibName for snapshots.

				c.Properties.SnapshotRuntimeLibs = append(c.Properties.SnapshotRuntimeLibs, BaseLibName(depName))

			case objDepTag:

cc/prebuilt_test.go

+4 −1
Original line number Diff line number Diff line
@@ -595,6 +595,9 @@ func TestMultiplePrebuilts(t *testing.T) { 
		libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_shared").Module()

		expectedDependency := ctx.ModuleForTests(tc.expectedDependencyName, "android_arm64_armv8-a_shared").Module()

		android.AssertBoolEquals(t, fmt.Sprintf("expected dependency from %s to %s\n", libfoo.Name(), tc.expectedDependencyName), true, hasDep(ctx, libfoo, expectedDependency))

		// check that LOCAL_SHARED_LIBRARIES contains libbar and not libbar.v<N>

		entries := android.AndroidMkEntriesForTest(t, ctx, libfoo)[0]

		android.AssertStringListContains(t, "Version should not be present in LOCAL_SHARED_LIBRARIES", entries.EntryMap["LOCAL_SHARED_LIBRARIES"], "libbar")



		// check installation rules

		// the selected soong module should be exported to make
@@ -603,7 +606,7 @@ func TestMultiplePrebuilts(t *testing.T) { 


		// check LOCAL_MODULE of the selected module name

		// the prebuilt should have the same LOCAL_MODULE when exported to make

		entries := android.AndroidMkEntriesForTest(t, ctx, libbar)[0]

		entries = android.AndroidMkEntriesForTest(t, ctx, libbar)[0]

		android.AssertStringEquals(t, "unexpected LOCAL_MODULE", "libbar", entries.EntryMap["LOCAL_MODULE"][0])

	}

}