Merge "Add property to prevent dex preopting"

androidmk/cmd/androidmk/android.go

@@ -135,6 +135,7 @@ func init() {
 			"LOCAL_PROPRIETARY_MODULE":       "proprietary",
 			"LOCAL_VENDOR_MODULE":            "vendor",
 			"LOCAL_EXPORT_PACKAGE_RESOURCES": "export_package_resources",
+			"LOCAL_DEX_PREOPT":               "dex_preopt",
 		})
 }
 

java/androidmk.go

@@ -36,6 +36,9 @@ 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 {
+						fmt.Fprintln(w, "LOCAL_DEX_PREOPT := false")
+					}
 				}
 				fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", library.deviceProperties.Sdk_version)
 			},

java/java.go

@@ -143,6 +143,10 @@ type CompilerDeviceProperties struct {
 	// If true, export a copy of the module as a -hostdex module for host testing.
 	Hostdex *bool
 
+	// If false, prevent dexpreopting and stripping the dex file from the final jar.  Defaults to
+	// true.
+	Dex_preopt *bool
+
 	// When targeting 1.9, override the modules to use with --system
 	System_modules *string
 }