Merge Android Pie into master

Bug: 112104996 Change-Id: I160274b2c2bbe8219ed9a3b5d39c3935bfcb13f0
2018-08-06 17:23:22 -07:00
parent 77a69ecb70 7481ee6e6d
commit 6bfe4eb42c
6 changed files with 29 additions and 9 deletions
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -41,6 +41,8 @@ var (
 		"services",
 		"android.car",
 		"android.car7",
+		"core-oj",
+		"core-libart",
 	}

 	ManifestMergerClasspath = []string{