commit 161efa8aceeed683f7f3302d5befc8e9567ce3cc
author android-build-team Robot <android-build-team-robot@google.com> Thu Jul 20 23:54:57 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jul 20 23:54:57 2017 +0000
tree 2d1c4c1cbe20b077701f5982152717ff2462b5df
parent 4093b47bf64b738bc6aee39857e214f899c857cc
parent 06afd21d793818c24c7a359f782c33a42ab08a70

Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-release

Change-Id: Ib1bdd5bfd64e3b3f85d864270c1ff688da4df672

rs_cc_options.cpp

diff --git a/rs_cc_options.cpp b/rs_cc_options.cpp
index 7aa185d..6746f17 100644
--- a/rs_cc_options.cpp
+++ b/rs_cc_options.cpp
@@ -290,9 +290,10 @@
 
   if (Opts.mTargetAPI == 0) {
     Opts.mTargetAPI = UINT_MAX;
-  } else if (Opts.mTargetAPI == SLANG_N_MR1_TARGET_API) {
+  } else if (Opts.mTargetAPI == SLANG_N_MR1_TARGET_API ||
+             Opts.mTargetAPI == SLANG_O_TARGET_API) {
     // Bug: http://b/35767071
-    // No new APIs for N_MR1, convert to N.
+    // No new APIs for N_MR1 or O, convert to N.
     Opts.mTargetAPI = SLANG_N_TARGET_API;
   }
 

slang_version.h

diff --git a/slang_version.h b/slang_version.h
index 7c07389..33c05c8 100644
--- a/slang_version.h
+++ b/slang_version.h
@@ -42,6 +42,7 @@
   SLANG_M_TARGET_API = 23,
   SLANG_N_TARGET_API = 24,
   SLANG_N_MR1_TARGET_API = 25,
+  SLANG_O_TARGET_API = 26,
   SLANG_MAXIMUM_TARGET_API = RS_VERSION,
   SLANG_DEVELOPMENT_TARGET_API = RS_DEVELOPMENT_API
 };