Merge "Remove M4 export to Make" am: a6ba0d2a4c am: 50e7c7f0c6 am: 9e2fd0fab6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1393489

Change-Id: Ifd730e562883e95c7ddfd59371ef92711b46bd81
This commit is contained in:
Dan Willemsen
2020-08-12 15:34:14 +00:00
committed by Automerger Merge Worker

View File

@@ -148,8 +148,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("AIDL_CPP", "${aidlCmd}") ctx.Strict("AIDL_CPP", "${aidlCmd}")
ctx.Strict("ALLOWED_MANUAL_INTERFACE_PATHS", strings.Join(allowedManualInterfacePaths, " ")) ctx.Strict("ALLOWED_MANUAL_INTERFACE_PATHS", strings.Join(allowedManualInterfacePaths, " "))
ctx.Strict("M4", "${m4Cmd}")
ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}") ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}")
ctx.Strict("SOONG_STRIP_PATH", "${stripPath}") ctx.Strict("SOONG_STRIP_PATH", "${stripPath}")