diff options
| author | Ying Wang <wangying@google.com> | 2015-07-20 18:40:18 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-07-20 21:26:53 -0700 |
| commit | c671a7cf5cae42b61991d9b72e53d9d8a6ace84e (patch) | |
| tree | e6f56e4836ff3722e56ffcf621b11a13cd472cbc /core/java.mk | |
| parent | 7ac6cb804083a67d31a16b910dabfb76b30150a3 (diff) | |
| download | build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.zip build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.tar.gz build-c671a7cf5cae42b61991d9b72e53d9d8a6ace84e.tar.bz2 | |
Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
- Don't overwrite [TARGET|HOST]_[CC|CXX] with the [CC|CXX]_WRAPPER prefix,
so that we can disable the wrapper per module.
- Disable ccache on a module when FDO is enabled.
Bug: 22612634
Change-Id: Ibc04a4742d589955066c7eceb43a0da9a2b893bc
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index b371289..0ff59fc 100644 --- a/core/java.mk +++ b/core/java.mk @@ -253,7 +253,7 @@ endif $(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \ $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt) $(rs_compatibility_jni_libs): $(BCC_COMPAT) -$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX) +$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX) $(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \ $(renderscript_intermediate.bc_folder)%.bc $(transform-bc-to-so) |