tree 584dd88bc76239254781ac1029818d0a93d12f80
parent d5411c8164b2f1857aeef3036ed4816b4f019987
author Greg Hartman <ghartman@google.com> 1535599294 -0700
committer Greg Hartman <ghartman@google.com> 1535668144 +0000

Resolve conflicts on Android.bp/.mk when building with O

BUG: 113551166
Change-Id: I0646638710abfc84707ca42faea10f94c87c1f4b
Test: oc and pi build and boot
Reviewed-on: https://swiftshader-review.googlesource.com/20329
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Greg Hartman <ghartman@google.com>