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
2018-08-24 11:17:39 -05:00
parent 32aef7a2cf 896de5423d
commit 58f2132bc3
208 changed files with 9097 additions and 4512 deletions
@@ -36,4 +36,6 @@ LOCAL_CFLAGS := \
    -Werror \
    -Wall

+LOCAL_C_INCLUDES := include
+
 include $(BUILD_STATIC_LIBRARY)