diff options
| author | Ying Wang <wangying@google.com> | 2014-10-08 22:25:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-08 22:25:17 +0000 |
| commit | edb9df24d00091a5206ba36d7f32ed75d6c462b9 (patch) | |
| tree | f4d4d16205e9fcfdd91d55cd28cb9f9ae37cd52d | |
| parent | 811e650b820ffa4f291d18d6f49673314848c810 (diff) | |
| parent | 62fb8a1f5591d1b664ba6ee3bad5bb8c83c5eaef (diff) | |
| download | build-ub-webview-m40-release.tar.gz | |
Merge "Check $(built_dex) to determine if we can run dex-preopt." into lmp-devwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-release
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index 28282ec784..741f9a3acf 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -25,7 +25,7 @@ endif ifdef LOCAL_UNINSTALLABLE_MODULE LOCAL_DEX_PREOPT := endif -ifeq (,$(strip $(all_java_sources)$(full_static_java_libs)$(my_prebuilt_src_file))) # contains no java code +ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code LOCAL_DEX_PREOPT := endif # if module oat file requested in data, disable LOCAL_DEX_PREOPT, will default location to dalvik-cache |