diff options
| author | Xusong Wang <xusongw@google.com> | 2021-05-07 20:49:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 20:49:32 +0000 |
| commit | 0aeb4ec8041345cb0d59ddcd1f09c5dec9633e56 (patch) | |
| tree | b77bdf0926442a5b1c72f42c10ae68f67f57afa8 | |
| parent | 14b956e3969ca2e709da674ef0d6c35b76e5a921 (diff) | |
| parent | 5ad64063eeff6dd6c6affce457ed169e0e7b2a03 (diff) | |
| download | slang-0aeb4ec8041345cb0d59ddcd1f09c5dec9633e56.tar.gz | |
Increase the upper limit of slang target API to 31. am: 5ad64063ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/slang/+/14470202
Change-Id: I4450656399d4bb589d3b872b71fccdb8cb8206b9
| -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). |