Merge "Support Make rewriting APP-*" am: 977fd8f1fa

am: 38220c5554

Change-Id: Ibd69ab97407b3ac43109fc23c2fe52b2cd65f74b
This commit is contained in:
Dan Willemsen
2017-05-26 19:58:53 +00:00
committed by android-build-merger

View File

@@ -81,9 +81,10 @@ func runMakeProductConfig(ctx Context, config Config) {
// Variables to export into the environment of Kati/Ninja
exportEnvVars := []string{
// So that we can use the correct TARGET_PRODUCT if it's been
// modified by PRODUCT-* arguments
// modified by PRODUCT-*/APP-* arguments
"TARGET_PRODUCT",
"TARGET_BUILD_VARIANT",
"TARGET_BUILD_APPS",
// compiler wrappers set up by make
"CC_WRAPPER",