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

Commit cb16a92e authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Mark vndkLibrariesTxt modules as device modules"

parents 70275c03 45bce85f

cc/cc_test.go

+7 −7
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ func checkVndkOutput(t *testing.T, ctx *android.TestContext, output string, expe 


func checkVndkLibrariesOutput(t *testing.T, ctx *android.TestContext, module string, expected []string) {

	t.Helper()

	got := ctx.ModuleForTests(module, "").Module().(*vndkLibrariesTxt).fileNames

	got := ctx.ModuleForTests(module, "android_common").Module().(*vndkLibrariesTxt).fileNames

	assertArrayString(t, got, expected)

}
@@ -532,11 +532,11 @@ func TestVndk(t *testing.T) { 
	CheckSnapshot(t, ctx, snapshotSingleton, "libllndk", "libllndk.so", llndkLib2ndPath, variant2nd)



	snapshotConfigsPath := filepath.Join(snapshotVariantPath, "configs")

	CheckSnapshot(t, ctx, snapshotSingleton, "llndk.libraries.txt", "llndk.libraries.txt", snapshotConfigsPath, "")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkcore.libraries.txt", "vndkcore.libraries.txt", snapshotConfigsPath, "")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndksp.libraries.txt", "vndksp.libraries.txt", snapshotConfigsPath, "")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkprivate.libraries.txt", "vndkprivate.libraries.txt", snapshotConfigsPath, "")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkproduct.libraries.txt", "vndkproduct.libraries.txt", snapshotConfigsPath, "")

	CheckSnapshot(t, ctx, snapshotSingleton, "llndk.libraries.txt", "llndk.libraries.txt", snapshotConfigsPath, "android_common")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkcore.libraries.txt", "vndkcore.libraries.txt", snapshotConfigsPath, "android_common")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndksp.libraries.txt", "vndksp.libraries.txt", snapshotConfigsPath, "android_common")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkprivate.libraries.txt", "vndkprivate.libraries.txt", snapshotConfigsPath, "android_common")

	CheckSnapshot(t, ctx, snapshotSingleton, "vndkproduct.libraries.txt", "vndkproduct.libraries.txt", snapshotConfigsPath, "android_common")



	checkVndkOutput(t, ctx, "vndk/vndk.libraries.txt", []string{

		"LLNDK: libc.so",
@@ -614,7 +614,7 @@ func TestVndkLibrariesTxtAndroidMk(t *testing.T) { 
	config.TestProductVariables.Platform_vndk_version = StringPtr("29")

	ctx := testCcWithConfig(t, config)



	module := ctx.ModuleForTests("llndk.libraries.txt", "")

	module := ctx.ModuleForTests("llndk.libraries.txt", "android_common")

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

	assertArrayString(t, entries.EntryMap["LOCAL_MODULE_STEM"], []string{"llndk.libraries.29.txt"})

}

cc/vndk.go

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ func newVndkLibrariesWithMakeVarFilter(lister moduleListerFunc, makeVarName stri 
		filterOutFromMakeVar: filter,

	}

	m.AddProperties(&m.properties)

	android.InitAndroidModule(m)

	android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)

	return m

}