diff options
author | Andrei Onea <andreionea@google.com> | 2023-05-03 11:18:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-03 11:18:18 +0000 |
commit | 10e519844bae2ae118493de46815a3c48461b75e (patch) | |
tree | a6a5f00e321a5324313cbf94d84a8aa49fe97745 | |
parent | 306d33f597951bbba35aa737c11858e9aa910439 (diff) | |
parent | 91ecefa20f810bd5091260d1c16223064a3a6402 (diff) | |
download | platform-compat-10e519844bae2ae118493de46815a3c48461b75e.tar.gz |
Add extra filtering when collecting shared libraries am: 75d07190be am: ff5a97db0a am: 91ecefa20f
Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2571850
Change-Id: I2cd10e6b441fcdb8c59aeccdbf2fdb4477ae8ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | java/android/compat/testing/app/SharedLibraryInfoDeviceTest.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/java/android/compat/testing/app/SharedLibraryInfoDeviceTest.java b/java/android/compat/testing/app/SharedLibraryInfoDeviceTest.java index 054f51f..64e2337 100644 --- a/java/android/compat/testing/app/SharedLibraryInfoDeviceTest.java +++ b/java/android/compat/testing/app/SharedLibraryInfoDeviceTest.java @@ -29,6 +29,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.modules.utils.build.SdkLevel; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; import org.junit.After; import org.junit.Before; @@ -40,6 +41,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; import java.util.Locale; +import java.util.Set; /** * Device-side helper app for obtaining shared libraries. @@ -51,6 +53,11 @@ import java.util.Locale; public class SharedLibraryInfoDeviceTest { private static final String TAG = "SharedLibraryInfoDeviceTest"; + private static final Set<String> T_PLUS_EXCLUDES = ImmutableSet.of( + // This shared library's code is added to the bootclasspath in T+ by the + // AdServices mainline module. + "android.ext.adservices" + ); private final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation(); private final Context context = instrumentation.getTargetContext(); @@ -76,7 +83,7 @@ public class SharedLibraryInfoDeviceTest { ImmutableList.Builder<String> content = ImmutableList.builder(); for (SharedLibraryInfo sharedLibrary : sharedLibraries) { - if (!sharedLibrary.isNative()) { + if (!canSafelyIgnoreSharedLibrary(sharedLibrary)) { content.add(String.format(Locale.US, "%s %d %d %s", sharedLibrary.getName(), sharedLibrary.getType(), @@ -92,4 +99,14 @@ public class SharedLibraryInfoDeviceTest { Files.write(detailsFilepath, lines); } + private boolean canSafelyIgnoreSharedLibrary(SharedLibraryInfo sharedLibrary) { + if (sharedLibrary.isNative()) { + return true; + } + if (SdkLevel.isAtLeastT()) { + return T_PLUS_EXCLUDES.contains(sharedLibrary.getName()); + } + return false; + } + } |