Merge AOSP android-9.0.0_r3

Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
3vfxvc · Aug 24, 2018 · 58f2132 · 58f2132
2 parents 32aef7a + 896de54
commit 58f2132
Show file tree

Hide file tree

Showing 208 changed files with 9,020 additions and 4,435 deletions.
diff --git a/.clang-format b/.clang-format
@@ -10,6 +10,5 @@ IndentWidth: 2
 PointerAlignment: Left
 TabWidth: 2
 UseTab: Never
-PenaltyExcessCharacter: 32
 
 Cpp11BracedListStyle: false
diff --git a/Android.bp b/Android.bp
@@ -1,4 +1,8 @@
 subdirs = [
-//    "bootloader_message",
+//    "applypatch",
+    "bootloader_message",
+//    "edify",
+//    "otafault",
 //    "otautil",
+//    "uncrypt",
 ]