[sanitizer] Cleanup Android lit file

[vitalybuka]

Summary

Depends on D90790.

[oontvoo]

compiler-rt/test/lit.common.cfg.py

369

We need both the codename and the api-level because we need the thread-properties-api which may or may not be in 31 (unknown at the moment), we only know it's in 'S'.

[vitalybuka]

compiler-rt/test/lit.common.cfg.py

369

If it's temporarily, can we just assume we don't run tests on 31 devices without that API?

391

I don't see anything broken.
I assume we didn't need that.

[oontvoo]

compiler-rt/test/lit.common.cfg.py

369

There're no "31 devices" right now - they're all still 29 (or 30 at the most). That's why this feature was named "-thread-properties-api" and not by api-level number.

Either we leave it like this, or pull the libc.so and look for the api symbols?

[oontvoo]

compiler-rt/test/lit.common.cfg.py

369

P.S:

391

I don't see anything broken.

Not yet. :-)

The dynamic-tls leak check is currently broken on glibc-2.27. The test is expected to fail. But when run on android, it will pass as "Unexpected Success". So this change was to make sure "glibc-2.27" is not set for android, allowing the test to be expected-pass.

[vitalybuka]

lgtm as-is

compiler-rt/test/lit.common.cfg.py

if config.android:
   # suppression-files, to device.
   config.substitutions.append( ('%device_rundir', "/data/local/tmp/Output") )
   config.substitutions.append( ('%push_to_device', "%s -s '%s' push " % (adb, env['ANDROID_SERIAL']) ) )
   config.substitutions.append( ('%pull_from_device', "%s -s '%s' pull " % (adb, env['ANDROID_SERIAL']) ) )
   config.substitutions.append( ('%adb_shell ', "%s -s '%s' shell " % (adb, env['ANDROID_SERIAL']) ) )
 
   try:
     android_api_level_str = subprocess.check_output([adb, "shell", "getprop", "ro.build.version.sdk"], env=env).rstrip()
-    android_api_codename = subprocess.check_output([adb, "shell", "getprop", "ro.build.version.codename"], env=env).rstrip().decode("utf-8")
   except (subprocess.CalledProcessError, OSError):
     lit_config.fatal("Failed to read ro.build.version.sdk (using '%s' as adb)" % adb)
   try:
     android_api_level = int(android_api_level_str)
   except ValueError:
     lit_config.fatal("Failed to read ro.build.version.sdk (using '%s' as adb): got '%s'" % (adb, android_api_level_str))
   if android_api_level >= 26:
     config.available_features.add('android-26')
   if android_api_level >= 28:
     config.available_features.add('android-28')
-  if android_api_level >= 31 or android_api_codename == 'S':
-    config.available_features.add('android-thread-properties-api')
+  if android_api_level >= 31:
+    config.available_features.add('android-31')
 
   # Prepare the device.
   android_tmpdir = '/data/local/tmp/Output'
   subprocess.check_call([adb, "shell", "mkdir", "-p", android_tmpdir], env=env)
   for file in config.android_files_to_push:
     subprocess.check_call([adb, "push", file, android_tmpdir], env=env)
 else:
   config.substitutions.append( ('%device_rundir', "") )
   config.substitutions.append( ('%push_to_device', "echo ") )
   config.substitutions.append( ('%pull_from_device', "echo ") )
   config.substitutions.append( ('%adb_shell', "echo ") )
 
 if config.host_os == 'Linux':
   # detect whether we are using glibc, and which version
   # NB: 'ldd' is just one of the tools commonly installed as part of glibc
   ldd_ver_cmd = subprocess.Popen(['ldd', '--version'],
                                  stdout=subprocess.PIPE,
                                  env={'LANG': 'C'})
   sout, _ = ldd_ver_cmd.communicate()
   ver_line = sout.splitlines()[0]
-  if not config.android and ver_line.startswith(b"ldd "):
+  if ver_line.startswith(b"ldd "):
     from distutils.version import LooseVersion
     ver = LooseVersion(ver_line.split()[-1].decode())
     # 2.27 introduced some incompatibilities
     if ver >= LooseVersion("2.27"):
       config.available_features.add("glibc-2.27")
 
 sancovcc_path = os.path.join(config.llvm_tools_dir, "sancov")
 if os.path.exists(sancovcc_path):