Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-releaseandroid-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-release

Change-Id: Ib1bdd5bfd64e3b3f85d864270c1ff688da4df672

2 files changed, 4 insertions, 2 deletions

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 @@ bool ParseArguments(const llvm::ArrayRef<const char *> &ArgsIn,
 
   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;
   }
 
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 @@ enum SlangTargetAPI {
   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
 };