Merge "Support Make rewriting APP-*"

am: 977fd8f1fa

Change-Id: If48e81cd099868d856f0b67820f7571c8fe4854a
This commit is contained in:
Dan Willemsen
2017-05-26 19:56:52 +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 // Variables to export into the environment of Kati/Ninja
exportEnvVars := []string{ exportEnvVars := []string{
// So that we can use the correct TARGET_PRODUCT if it's been // 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_PRODUCT",
"TARGET_BUILD_VARIANT", "TARGET_BUILD_VARIANT",
"TARGET_BUILD_APPS",
// compiler wrappers set up by make // compiler wrappers set up by make
"CC_WRAPPER", "CC_WRAPPER",