OSDN Git Service

Resolve conflicts on Android.bp/.mk when building with O
authorGreg Hartman <ghartman@google.com>
Thu, 30 Aug 2018 03:21:34 +0000 (20:21 -0700)
committerGreg Hartman <ghartman@google.com>
Thu, 30 Aug 2018 22:29:04 +0000 (22:29 +0000)
commit62cfbb9c7876f1f5335e3f20be67175da1b698a7
tree584dd88bc76239254781ac1029818d0a93d12f80
parentd5411c8164b2f1857aeef3036ed4816b4f019987
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>
src/Android.bp