Merge "Introduce prebuilt_media_audio module type" into main (22804bec) · Commits · e / os / android_build_soong

etc/prebuilt_etc.go

+11 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ func RegisterPrebuiltEtcBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("prebuilt_dsp", PrebuiltDSPFactory)
		ctx.RegisterModuleType("prebuilt_rfsa", PrebuiltRFSAFactory)
		ctx.RegisterModuleType("prebuilt_renderscript_bitcode", PrebuiltRenderScriptBitcodeFactory)
		ctx.RegisterModuleType("prebuilt_media_audio", PrebuiltMediaAudioFactory)

		ctx.RegisterModuleType("prebuilt_defaults", defaultsFactory)

		@@ -788,3 +789,13 @@ func PrebuiltRFSAFactory() android.Module {
		android.InitDefaultableModule(module)
		return module
		}

		// prebuilt_media_audio installs audio files in <partition>/media/audio directory.
		func PrebuiltMediaAudioFactory() android.Module {
		module := &PrebuiltEtc{}
		InitPrebuiltEtcModule(module, "media/audio")
		// This module is device-only
		android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
		android.InitDefaultableModule(module)
		return module
		}

+15 −0

Original line number	Diff line number	Diff line
		@@ -588,3 +588,18 @@ func TestPrebuiltRFSADirPath(t *testing.T) {
		})
		}
		}

		func TestPrebuiltMediaAutoDirPath(t *testing.T) {
		result := prepareForPrebuiltEtcTest.RunTestWithBp(t, `
		prebuilt_media_audio {
		name: "foo",
		src: "Alarm_Beep_01.ogg",
		product_specific: true,
		relative_install_path: "alarms"
		}
		`)

		p := result.Module("foo", "android_common").(*PrebuiltEtc)
		expected := "out/soong/target/product/test_device/product/media/audio/alarms"
		android.AssertPathRelativeToTopEquals(t, "install dir", expected, p.installDirPaths[0])
		}