Merge "Implement linux sandboxing with nsjail"
diff --git a/android/config.go b/android/config.go
index 925ca94..7c1278e 100644
--- a/android/config.go
+++ b/android/config.go
@@ -649,7 +649,7 @@
func (c *config) EnableXOM() bool {
if c.productVariables.EnableXOM == nil {
- return false
+ return true
} else {
return Bool(c.productVariables.EnableXOM)
}
diff --git a/java/androidmk.go b/java/androidmk.go
index 4d3af12..930354e 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -75,6 +75,11 @@
fmt.Fprintln(w, "LOCAL_MODULE := "+name+"-hostdex")
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
fmt.Fprintln(w, "LOCAL_MODULE_CLASS := JAVA_LIBRARIES")
+ if library.dexJarFile != nil {
+ fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.dexJarFile.String())
+ } else {
+ fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", library.implementationAndResourcesJar.String())
+ }
if library.installFile == nil {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
}