Restore missing min and max API.android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaselinaro-android-6.0

min(float2/3/4, float) and max(float2/3/4, float) were defined in our
headers in K.  In L, they were removed by mistake.  This continued to
work however because a float would be auto converted by the compiler to
a float4.

In M, we started validating for unexpected external references, which
_Z3minDv4_ff is.  This can prevent programs compiled with K from running
on M.

This CL fixes the whitelist.

Bug:23389429

Change-Id: I21f59521b3744d0c5b6fd75dbf1810493e9c1d84
(cherry picked from commit 005666078051a3f8e1e0ff59678635f3c501cde8)

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/Renderscript/RSStubsWhiteList.cpp b/lib/Renderscript/RSStubsWhiteList.cpp
index b69681d..426fb43 100644
--- a/lib/Renderscript/RSStubsWhiteList.cpp
+++ b/lib/Renderscript/RSStubsWhiteList.cpp
@@ -1235,6 +1235,7 @@ std::vector<std::string> stubList = {
 "_Z3madfff",
 "_Z3maxDv2_cS_",
 "_Z3maxDv2_fS_",
+"_Z3maxDv2_ff",
 "_Z3maxDv2_hS_",
 "_Z3maxDv2_iS_",
 "_Z3maxDv2_jS_",
@@ -1244,6 +1245,7 @@ std::vector<std::string> stubList = {
 "_Z3maxDv2_tS_",
 "_Z3maxDv3_cS_",
 "_Z3maxDv3_fS_",
+"_Z3maxDv3_ff",
 "_Z3maxDv3_hS_",
 "_Z3maxDv3_iS_",
 "_Z3maxDv3_jS_",
@@ -1253,6 +1255,7 @@ std::vector<std::string> stubList = {
 "_Z3maxDv3_tS_",
 "_Z3maxDv4_cS_",
 "_Z3maxDv4_fS_",
+"_Z3maxDv4_ff",
 "_Z3maxDv4_hS_",
 "_Z3maxDv4_iS_",
 "_Z3maxDv4_jS_",
@@ -1271,6 +1274,7 @@ std::vector<std::string> stubList = {
 "_Z3maxtt",
 "_Z3minDv2_cS_",
 "_Z3minDv2_fS_",
+"_Z3minDv2_ff",
 "_Z3minDv2_hS_",
 "_Z3minDv2_iS_",
 "_Z3minDv2_jS_",
@@ -1280,6 +1284,7 @@ std::vector<std::string> stubList = {
 "_Z3minDv2_tS_",
 "_Z3minDv3_cS_",
 "_Z3minDv3_fS_",
+"_Z3minDv3_ff",
 "_Z3minDv3_hS_",
 "_Z3minDv3_iS_",
 "_Z3minDv3_jS_",
@@ -1289,6 +1294,7 @@ std::vector<std::string> stubList = {
 "_Z3minDv3_tS_",
 "_Z3minDv4_cS_",
 "_Z3minDv4_fS_",
+"_Z3minDv4_ff",
 "_Z3minDv4_hS_",
 "_Z3minDv4_iS_",
 "_Z3minDv4_jS_",