diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-14 16:52:52 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-14 16:52:52 +0000 |
| commit | 2213e5cab04399901d4bde37c4d23d53ed711ad9 (patch) | |
| tree | b77bdf0926442a5b1c72f42c10ae68f67f57afa8 | |
| parent | 2a69f7588a3b70ba12a9ae542c6f63bf118b3283 (diff) | |
| parent | 5ad64063eeff6dd6c6affce457ed169e0e7b2a03 (diff) | |
| download | slang-android12--mainline-release.tar.gz | |
Snap for 7362376 from 5ad64063eeff6dd6c6affce457ed169e0e7b2a03 to sc-mainline-releaseandroid-mainline-12.0.0_r4android-mainline-12.0.0_r36android12--mainline-release
Change-Id: Ic4374cbb64e3a43630393e9f3cec1cf4c67b91ea
| -rw-r--r-- | rs_cc_options.cpp | 10 | ||||
| -rw-r--r-- | slang_version.h | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/rs_cc_options.cpp b/rs_cc_options.cpp index ad1dc13..89720a3 100644 --- a/rs_cc_options.cpp +++ b/rs_cc_options.cpp @@ -295,13 +295,11 @@ 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 || - Opts.mTargetAPI == SLANG_O_TARGET_API || - Opts.mTargetAPI == SLANG_O_MR1_TARGET_API || - Opts.mTargetAPI == SLANG_P_TARGET_API) { + } else if (Opts.mTargetAPI > SLANG_MAXIMUM_TARGET_API && + Opts.mTargetAPI <= SLANG_MAXIMUM_CMDLINE_TARGET_API) { // Bug: http://b/35767071 - // No new APIs for N_MR1, O, O_MR1 and P, convert to N. - Opts.mTargetAPI = SLANG_N_TARGET_API; + // No new APIs after N, convert to N. + Opts.mTargetAPI = SLANG_MAXIMUM_TARGET_API; } if ((Opts.mTargetAPI < 21) || (Opts.mBitcodeStorage == BCST_CPP_CODE)) diff --git a/slang_version.h b/slang_version.h index 7ca6230..e6e47a3 100644 --- a/slang_version.h +++ b/slang_version.h @@ -46,7 +46,12 @@ enum SlangTargetAPI { SLANG_O_TARGET_API = 26, SLANG_O_MR1_TARGET_API = 27, SLANG_P_TARGET_API = 28, + SLANG_Q_TARGET_API = 29, + SLANG_R_TARGET_API = 30, + SLANG_S_TARGET_API = 31, SLANG_MAXIMUM_TARGET_API = RS_VERSION, + // The maximum API level that is acceptable for the "-target-api" commandline option. + SLANG_MAXIMUM_CMDLINE_TARGET_API = SLANG_S_TARGET_API, SLANG_DEVELOPMENT_TARGET_API = RS_DEVELOPMENT_API }; // Note that RS_VERSION is defined at build time (see Android.mk for details). |