StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add property to prevent dex preopting"

Browse Source
This commit is contained in:
Colin Cross
2017-10-19 23:01:02 +00:00
committed by Gerrit Code Review
parent 16792167ad a22116e2d9
commit 38cd9a4ec7
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
androidmk/cmd/androidmk/android.go
View File

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

3
java/androidmk.go
View File

@@ -36,6 +36,9 @@ func (library *Library) AndroidMk() android.AndroidMkData {
} }
if library.dexJarFile != nil { if library.dexJarFile != nil {
fmt.Fprintln(w, "LOCAL_SOONG_DEX_JAR :=", library.dexJarFile.String()) 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) fmt.Fprintln(w, "LOCAL_SDK_VERSION :=", library.deviceProperties.Sdk_version)
}, },

4
java/java.go
View File

@@ -143,6 +143,10 @@ type CompilerDeviceProperties struct {
// If true, export a copy of the module as a -hostdex module for host testing. // If true, export a copy of the module as a -hostdex module for host testing.
Hostdex *bool 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 // When targeting 1.9, override the modules to use with --system
System_modules *string System_modules *string
} }