| commit | cf7d5ab6d6414acae6ab93e40cabd2a37760d1ca | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Mon Sep 10 21:36:38 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Sep 10 21:36:38 2018 +0000 |
| tree | 01a7ef9260e47c1900677ee9d985a1aa8a48b591 | |
| parent | d2e92da626719d399a138c57324e0447f0cb8c8c [diff] | |
| parent | cb9342eabd937601a7328d7c19e988b3b378b676 [diff] |
Merge "Revert "Use soong_cc_prebuilt.mk instead of prebuilt.mk for Soong cc modules""
diff --git a/cc/makevars.go b/cc/makevars.go index 4af0a99..17edcdf 100644 --- a/cc/makevars.go +++ b/cc/makevars.go
@@ -148,6 +148,9 @@ ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}") + ctx.Strict("SOONG_STRIP_PATH", "${stripPath}") + ctx.Strict("XZ", "${xzCmd}") + nativeHelperIncludeFlags, err := ctx.Eval("${config.CommonNativehelperInclude}") if err != nil { panic(err)