| commit | 58f2132bc3954fc704787d477500a209eedb8e29 | [log] [tgz] |
|---|---|---|
| author | Ethan Yonker <dees_troy@teamw.in> | Fri Aug 24 11:17:36 2018 -0500 |
| committer | Ethan Yonker <dees_troy@teamw.in> | Fri Aug 24 11:17:39 2018 -0500 |
| tree | eb0f79aacd68724b0c0c091018384ef924380f47 | |
| parent | 32aef7a2cf8ef3881e1efdce6cf693bc762cc604 [diff] [blame] | |
| parent | 896de5423db1ec3824797e11199a08be20b02d1d [diff] [blame] |
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
diff --git a/otautil/Android.mk b/otautil/Android.mk index 45e0f76..feb468d 100644 --- a/otautil/Android.mk +++ b/otautil/Android.mk
@@ -36,4 +36,6 @@ -Werror \ -Wall +LOCAL_C_INCLUDES := include + include $(BUILD_STATIC_LIBRARY)