commit 9deea37a07db65be14437f8ed458a792dce11955
author Dan Albert <danalbert@google.com> Thu May 07 15:58:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 07 15:58:29 2015 +0000
tree bd322dd09bc6187071a783436e37ebfd7b3187cb
parent 9a682002d0f0da0292af5b8e96aa51b7942acf81
parent 698d0464a52ee2610c4590ef313fe587deedb081

am 698d0464: Merge "Whitelist device for stlport."

* commit '698d0464a52ee2610c4590ef313fe587deedb081':
  Whitelist device for stlport.

device.mk

diff --git a/device.mk b/device.mk
index 42bbaa8..5756795 100644
--- a/device.mk
+++ b/device.mk
@@ -30,6 +30,10 @@
 PRODUCT_PACKAGES += \
     nfc_nci.bcm2079x.default
 
+# http://b/15193147
+# TODO(danalbert): Remove this once stlport is dead and gone.
+PRODUCT_PACKAGES +=  libstlport
+
 # Do not power down SIM card when modem is sent to Low Power Mode.
 PRODUCT_PROPERTY_OVERRIDES += \
         persist.radio.apm_sim_not_pwdn=1