summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-12-14 11:47:19 -0800
committer Colin Cross <ccross@android.com> 2018-12-14 11:49:58 -0800
commit4ff85ebeb782a08ffeaefb8fbcdd678e89aec87f (patch)
treeb2a63ee0091756b871d99431113e9b1d79950365 /android/variable.go
parent359e6436be620356b3860ab52d6e98f4a997e68a (diff)
Revert "Dexpreopt soong modules inside soong"
This reverts commit 29ff88741e710b05743dcf347484c31311e81cda. Test: none Bug: 119412419
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/android/variable.go b/android/variable.go
index 85937e3b1..f4960086d 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -196,10 +196,9 @@ type productVariables struct {
UncompressPrivAppDex *bool `json:",omitempty"`
ModulesLoadedByPrivilegedModules []string `json:",omitempty"`
-
- DisableDexPreopt *bool `json:",omitempty"`
- DisableDexPreoptModules []string `json:",omitempty"`
- DexPreoptProfileDir *string `json:",omitempty"`
+ DefaultStripDex *bool `json:",omitempty"`
+ DisableDexPreopt *bool `json:",omitempty"`
+ DisableDexPreoptModules []string `json:",omitempty"`
IntegerOverflowExcludePaths *[]string `json:",omitempty"`
@@ -258,8 +257,6 @@ type productVariables struct {
Exclude_draft_ndk_apis *bool `json:",omitempty"`
FlattenApex *bool `json:",omitempty"`
-
- DexpreoptGlobalConfig *string `json:",omitempty"`
}
func boolPtr(v bool) *bool {