summaryrefslogtreecommitdiff
path: root/cpu_ref
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-05-18 15:24:29 -0700
committerColin Cross <ccross@android.com>2017-05-18 15:24:29 -0700
commit9f944561dae17cb00f2cfd14009d683d9566d994 (patch)
tree0670110e954573776a1f095eb6fcc664a3bcd99f /cpu_ref
parent27808e6a106262ef02200672db597473680e109a (diff)
downloadrs-9f944561dae17cb00f2cfd14009d683d9566d994.tar.gz
Reconcile oc-dev-plus-aosp with master
Update oc-dev-plus-aosp with the changes between If935ce5cc04da7801210acb49f0a9ed15fcf5889 and Ia98501a471ef5f090446c9fbe2dd1d3422021a6f. Change-Id: I3f613064b7406bad98644de9c1a9833cf4af324a Merged-In: Ia98501a471ef5f090446c9fbe2dd1d3422021a6f
Diffstat (limited to 'cpu_ref')
-rw-r--r--cpu_ref/Android.bp3
1 files changed, 0 insertions, 3 deletions
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 53787832..84b2b0b7 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -117,8 +117,5 @@ cc_library_shared {
// is not available in PDK.
enabled: false,
},
- override_rs_driver: {
- cflags: ["-DOVERRIDE_RS_DRIVER=%s"],
- },
},
}