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

Commit ffd6ffed authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Add vintf_fragments." am: 51ba4a79 am: f974294c 

am: ab4a214c

Change-Id: I43201a0b0bfe6dab20652f5f418f5513fb9355ee
parents 754362fa ab4a214c

android/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ func translateAndroidMkModule(ctx SingletonContext, w io.Writer, mod blueprint.M 
		if len(amod.commonProperties.Init_rc) > 0 {

			fmt.Fprintln(&data.preamble, "LOCAL_INIT_RC := ", strings.Join(amod.commonProperties.Init_rc, " "))

		}

		if len(amod.commonProperties.Vintf_fragments) > 0 {

			fmt.Fprintln(&data.preamble, "LOCAL_VINTF_FRAGMENTS := ", strings.Join(amod.commonProperties.Vintf_fragments, " "))

		}

		if Bool(amod.commonProperties.Proprietary) {

			fmt.Fprintln(&data.preamble, "LOCAL_PROPRIETARY_MODULE := true")

		}

android/module.go

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ type commonProperties struct { 
	// init.rc files to be installed if this module is installed

	Init_rc []string



	// VINTF manifest fragments to be installed if this module is installed

	Vintf_fragments []string



	// names of other modules to install if this module is installed

	Required []string `android:"arch_variant"`

androidmk/cmd/androidmk/android.go

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ func init() { 
			"LOCAL_EXPORT_SHARED_LIBRARY_HEADERS": "export_shared_lib_headers",

			"LOCAL_EXPORT_STATIC_LIBRARY_HEADERS": "export_static_lib_headers",

			"LOCAL_INIT_RC":                       "init_rc",

			"LOCAL_VINTF_FRAGMENTS":               "vintf_fragments",

			"LOCAL_TIDY_FLAGS":                    "tidy_flags",

			// TODO: This is comma-separated, not space-separated

			"LOCAL_TIDY_CHECKS":           "tidy_checks",