From b4972e3d96b62e5fe0052efda6a400a6ef8e4184 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 22 Nov 2017 16:02:44 -0800 Subject: [PATCH] Fix passing dex_preopt value to make dex_preopt defaults to true, only pass LOCAL_DEX_PREOPT := false if dex_preopt is explcitly set to false. Test: m, examine framework.jar Change-Id: Ica6ce06d14bbc720da9c5b26559b9768a8a7f5a8 --- java/androidmk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/androidmk.go b/java/androidmk.go index 1c0526aec..1a4b27d7a 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -36,7 +36,7 @@ func (library *Library) AndroidMk() android.AndroidMkData { } if library.dexJarFile != nil { fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String()) - if library.deviceProperties.Dex_preopt == nil || *library.deviceProperties.Dex_preopt == false { + if library.deviceProperties.Dex_preopt != nil && *library.deviceProperties.Dex_preopt == false { fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false") } }