diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-22 07:24:50 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-22 07:24:50 +0000 |
commit | ee51c122e2f0d4443c6c5d7a03f6c0f86cd31216 (patch) | |
tree | 496bf16dbe4660e4a6a267df4f563dc4bae1a851 | |
parent | fbd286e312c808e3257d4a2df039ff5bbc3d27e3 (diff) | |
parent | f0cee34637b4aea3af6c9f5f8635601d895f7c09 (diff) | |
download | slang-pie-vts-release.tar.gz |
Snap for 4736748 from f0cee34637b4aea3af6c9f5f8635601d895f7c09 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I046ae3ba477dd9b663b828efb6a11a3842bc0732
-rw-r--r-- | rs_cc_options.cpp | 6 | ||||
-rw-r--r-- | slang_version.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/rs_cc_options.cpp b/rs_cc_options.cpp index 6746f17..f84294b 100644 --- a/rs_cc_options.cpp +++ b/rs_cc_options.cpp @@ -291,9 +291,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_TARGET_API || + Opts.mTargetAPI == SLANG_O_MR1_TARGET_API || + Opts.mTargetAPI == SLANG_P_TARGET_API) { // Bug: http://b/35767071 - // No new APIs for N_MR1 or O, convert to N. + // No new APIs for N_MR1, O, O_MR1 and P, convert to N. Opts.mTargetAPI = SLANG_N_TARGET_API; } diff --git a/slang_version.h b/slang_version.h index aae7d04..7ca6230 100644 --- a/slang_version.h +++ b/slang_version.h @@ -44,6 +44,8 @@ enum SlangTargetAPI { SLANG_N_TARGET_API = 24, SLANG_N_MR1_TARGET_API = 25, SLANG_O_TARGET_API = 26, + SLANG_O_MR1_TARGET_API = 27, + SLANG_P_TARGET_API = 28, SLANG_MAXIMUM_TARGET_API = RS_VERSION, SLANG_DEVELOPMENT_TARGET_API = RS_DEVELOPMENT_API }; |