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

Commit 21e3c155 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Support overrides for android_app" am: fe295b45 am: d7a3f046 am: 60a08e23 

am: e257eec0

Change-Id: I3f93eb1c5374ea75e6c31dfcfa81db2a939201dd
parents a4749ca9 e257eec0

java/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData { 
				}



				fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", app.certificate.pem.String())

				if len(app.appProperties.Overrides) > 0 {

					fmt.Fprintln(w, "LOCAL_OVERRIDES_PACKAGES := "+strings.Join(app.appProperties.Overrides, " "))

				}

			},

		},

	}

java/app.go

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ type appProperties struct { 


	// list of resource labels to generate individual resource packages

	Package_splits []string



	// Names of modules to be overridden. Listed modules can only be other binaries

	// (in Make or Soong).

	// This does not completely prevent installation of the overridden binaries, but if both

	// binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will be removed

	// from PRODUCT_PACKAGES.

	Overrides []string

}



type AndroidApp struct {