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

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

Merge "Make prebuilt_font use the common arch" into main

parents cc723c5a c49443ed

etc/prebuilt_etc.go

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ func PrebuiltFontFactory() android.Module { 
	module := &PrebuiltEtc{}

	InitPrebuiltEtcModule(module, "fonts")

	// This module is device-only

	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibFirst)

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

	android.InitDefaultableModule(module)

	return module

}

etc/prebuilt_etc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ func TestPrebuiltFontInstallDirPath(t *testing.T) { 
		}

	`)



	p := result.Module("foo.conf", "android_arm64_armv8-a").(*PrebuiltEtc)

	p := result.Module("foo.conf", "android_common").(*PrebuiltEtc)

	expected := "out/soong/target/product/test_device/system/fonts"

	android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])

}