diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-08 03:07:06 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-08 03:07:06 +0000 |
commit | 9bf59e91d24661c9abaf292718478e5291b3f70b (patch) | |
tree | b77bdf0926442a5b1c72f42c10ae68f67f57afa8 | |
parent | 7c06d39d2be00acd29381a8aaf3751bb512eee76 (diff) | |
parent | 5ad64063eeff6dd6c6affce457ed169e0e7b2a03 (diff) | |
download | slang-android12-s4-release.tar.gz |
Snap for 7347062 from 5ad64063eeff6dd6c6affce457ed169e0e7b2a03 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: I512348850d83d5a111c2894111c9b6dbb84c4570
-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). |