commit f8a98901b3b1093163fb1c7438b62bfcb3b27ee1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 08 01:42:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 08 01:42:56 2017 +0000
tree 34bd355cb0dd52e8b72d37038153822cea14ed03
parent 2d9223b21b733fde67da3ad697b77b2bcf458e69
parent db0457ef7558c5965d363e7d71e279dae1ad90ab

Merge "Automatically convert target API from 25 to 24."

rs_cc_options.cpp

diff --git a/rs_cc_options.cpp b/rs_cc_options.cpp
index 8c8ae58..7aa185d 100644
--- a/rs_cc_options.cpp
+++ b/rs_cc_options.cpp
@@ -290,6 +290,10 @@
 
   if (Opts.mTargetAPI == 0) {
     Opts.mTargetAPI = UINT_MAX;
+  } else if (Opts.mTargetAPI == SLANG_N_MR1_TARGET_API) {
+    // Bug: http://b/35767071
+    // No new APIs for N_MR1, convert to N.
+    Opts.mTargetAPI = SLANG_N_TARGET_API;
   }
 
   if ((Opts.mTargetAPI < 21) || (Opts.mBitcodeStorage == BCST_CPP_CODE))

slang_version.h

diff --git a/slang_version.h b/slang_version.h
index 74cd09e..6f96f76 100644
--- a/slang_version.h
+++ b/slang_version.h
@@ -41,6 +41,7 @@
   SLANG_KK_TARGET_API = 19,
   SLANG_M_TARGET_API = 23,
   SLANG_N_TARGET_API = 24,
+  SLANG_N_MR1_TARGET_API = 25,
   SLANG_MAXIMUM_TARGET_API = RS_VERSION,
   SLANG_DEVELOPMENT_TARGET_API = RS_DEVELOPMENT_API
 };