From d4122be915e72b5e1da981c956aa2865bc324054 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 10 Aug 2018 09:33:36 -0400
Subject: [PATCH] Support overrides for android_app

Test: use it
Change-Id: I61b933b757081f08a417e66a8c02d62916bd3f8b
---
 java/androidmk.go | 3 +++
 java/app.go       | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/java/androidmk.go b/java/androidmk.go
index 04e92c959..544322e03 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -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, " "))
+				}
 			},
 		},
 	}
diff --git a/java/app.go b/java/app.go
index 9e7530ebc..ef591b76f 100644
--- a/java/app.go
+++ b/java/app.go
@@ -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 {