commit 7dfae5023aa13336b90a308a9654b1c7636a6855
author Jaewoong Jung <jungjw@google.com> Mon Jan 28 16:19:33 2019 -0800
committer Jaewoong Jung <jungjw@google.com> Wed Jan 30 14:48:50 2019 -0800
tree b7b5744167d053f575e428766da2a1a77bbd0efd
parent 783986108785c5e4990a2c3d91579136380128bc

Make side change for prod override vars support.

For the new override vars, we don't support make-based overrides because
their primary purpose is to enable Soong migrations for the ones that
use inherit-package.

Bug: 122957760
Test: Manual build tests with Browser2, BrowserGoogle, and Chrome
Change-Id: Ia685511391f61fe143774e12b3b67b526049962a

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index cd8cd7f..16c6a86 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -150,6 +150,8 @@
 $(call add_json_str,  DexpreoptGlobalConfig,             $(DEX_PREOPT_CONFIG))
 
 $(call add_json_list, ManifestPackageNameOverrides,      $(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES))
+$(call add_json_list, PackageNameOverrides,              $(PRODUCT_PACKAGE_NAME_OVERRIDES))
+$(call add_json_list, CertificateOverrides,              $(PRODUCT_CERTIFICATE_OVERRIDES))
 
 $(call add_json_bool, EnforceSystemCertificate,          $(ENFORCE_SYSTEM_CERTIFICATE))
 $(call add_json_list, EnforceSystemCertificateWhitelist, $(ENFORCE_SYSTEM_CERTIFICATE_WHITELIST))