Fix build, don't rely on utility from library dependency
It creates a dependency circle in our build
Change-Id: Idcf4a7e31d536499fabc1c1b84235278bfb8e8be
diff --git a/src/test/testbase/java/com/android/tools/r8/androidresources/AndroidResourceTestingUtils.java b/src/test/testbase/java/com/android/tools/r8/androidresources/AndroidResourceTestingUtils.java
index f2e8b29..951663c 100644
--- a/src/test/testbase/java/com/android/tools/r8/androidresources/AndroidResourceTestingUtils.java
+++ b/src/test/testbase/java/com/android/tools/r8/androidresources/AndroidResourceTestingUtils.java
@@ -11,7 +11,6 @@
import com.android.aapt.Resources.Item;
import com.android.aapt.Resources.Package;
import com.android.aapt.Resources.ResourceTable;
-import com.android.build.shrinker.ResourceTableUtilKt;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestBase.Backend;
import com.android.tools.r8.TestRuntime.CfRuntime;
@@ -287,7 +286,11 @@
public ResourceNameToIdMapping(Resources.Type type, Package aPackage) {
for (Resources.Entry entry : type.getEntryList()) {
- mapping.put(entry.getName(), ResourceTableUtilKt.toIdentifier(aPackage, type, entry));
+ int id =
+ aPackage.getPackageId().getId() << 24
+ | type.getTypeId().getId() << 16
+ | entry.getEntryId().getId();
+ mapping.put(entry.getName(), id);
}
}
