commit ad0177b1fb6b78edd2f15c901c7586d37581a6d5
author Jaewoong Jung <jungjw@google.com> Fri Apr 24 15:22:40 2020 -0700
committer Jaewoong Jung <jungjw@google.com> Mon Apr 27 16:44:33 2020 -0700
tree 439b8a2b983982367e739f7dc90f5ce206baa77b
parent 01db260858bd320ea5d27ccf4fbeda3ea8bae66b

Add overrides to runtime_resource_overlay

(This is a cherry-pick change.)

Bug: 154928457
Test: app_test.go
Change-Id: Ia52bb9fd18c22b1a02d7b36afd41561cec0473f0
Merged-In: Ia52bb9fd18c22b1a02d7b36afd41561cec0473f0

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 68da23e..2c29192 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -676,6 +676,7 @@
 			func(entries *android.AndroidMkEntries) {
 				entries.SetString("LOCAL_CERTIFICATE", r.certificate.AndroidMkString())
 				entries.SetPath("LOCAL_MODULE_PATH", r.installDir.ToMakePath())
+				entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", r.properties.Overrides...)
 			},
 		},
 	}}