commit bebc846d74aceed58e02a8c5dd0018c49e896da7
author Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:45 2015 +0530
committer Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:45 2015 +0530
tree 8cab768dae0bf975f0d29ce131d7e2e507081248
parent 10c6da64c54c308ee965860aed2458f31f69f9a2
parent b6cde4751b8d4d77fa24eec9b5f1bfce0eca1794

Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I866372554efb330f5c88913b9105bac59f3fef1f

rs_version.mk

diff --git a/rs_version.mk b/rs_version.mk
index cbb70e9..909496a 100644
--- a/rs_version.mk
+++ b/rs_version.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-RS_VERSION := 21
+RS_VERSION := 22
 RS_VERSION_DEFINE := -DRS_VERSION=$(RS_VERSION)
 
 # Use RS_VERSION_DEFINE as part of your LOCAL_CFLAGS to have the proper value.

slang.cpp

diff --git a/slang.cpp b/slang.cpp
index c3ab7e6..039b17a 100644
--- a/slang.cpp
+++ b/slang.cpp
@@ -452,8 +452,6 @@
 
   // The compilation ended, clear
   mBackend.reset();
-  mASTContext.reset();
-  mPP.reset();
   mOS.reset();
 
   return mDiagEngine->hasErrorOccurred() ? 1 : 0;