commit e2f637f5bf56d7dda6218c262a0d674fb8ca4bb6
author android-build-prod (mdb) <android-build-team-robot@google.com> Sat Sep 16 03:56:47 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 16 03:56:47 2017 +0000
tree 2d1c4c1cbe20b077701f5982152717ff2462b5df
parent 4093b47bf64b738bc6aee39857e214f899c857cc
parent eb80f2be9c9f23ce5951f5f63eaf5ceb23bfabe2

Merge "release-request-8a6a1d17-d673-453b-8612-ea961499cd38-for-aosp-oreo-cts-release-4341710 snap-temp-L24800000103383547" into oreo-cts-release

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
 };