Remove internal element builder and vector code.

Remove additional String8 references from shared includes.

Change-Id: Iede11384b9fc5a303d15d47fd4074c800dc6ad5f

1 files changed, 5 insertions, 4 deletions

diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp
index fb00cd10..877b8bdb 100644
--- a/rsProgramFragment.cpp
+++ b/rsProgramFragment.cpp
@@ -30,7 +30,7 @@ ProgramFragment::ProgramFragment(Context *rsc, const char * shaderText, size_t s
     mConstantColor[2] = 1.f;
     mConstantColor[3] = 1.f;
 
-    mRSC->mHal.funcs.fragment.init(mRSC, this, mUserShader.string(), mUserShader.length(),
+    mRSC->mHal.funcs.fragment.init(mRSC, this, mUserShader, mUserShaderLen,
                                    textureNames, textureNamesCount, textureNamesLength);
 }
 
@@ -103,9 +103,10 @@ void ProgramFragmentState::init(Context *rsc) {
             "}\n";
 
     ObjectBaseRef<const Element> colorElem = Element::createRef(rsc, RS_TYPE_FLOAT_32, RS_KIND_USER, false, 4);
-    Element::Builder builder;
-    builder.add(colorElem.get(), "Color", 1);
-    ObjectBaseRef<const Element> constInput = builder.create(rsc);
+
+    const char *enames[] = { "Color" };
+    const Element *eins[] = {colorElem.get()};
+    ObjectBaseRef<const Element> constInput = Element::create(rsc, 1, eins, enames);
 
     ObjectBaseRef<Type> inputType = Type::getTypeRef(rsc, constInput.get(), 1, 0, 0, false, false, 0);