diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-13 00:23:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-13 00:23:48 +0000 |
| commit | 5aaac5ad1d519da28d2038804a3ba59d582be286 (patch) | |
| tree | f2101ae81fdf3d20e96d22185ff586c451340bb4 | |
| parent | 5d6c68fd9265e2962a110347af7c669da0a959fd (diff) | |
| parent | 1bfda5cc262ebb389f3226c7b73b90482f5f04f5 (diff) | |
| download | common-5aaac5ad1d519da28d2038804a3ba59d582be286.tar.gz | |
Snap for 11211173 from 1bfda5cc262ebb389f3226c7b73b90482f5f04f5 to 24Q1-release
Change-Id: I1a1fcd8b017f0e97ffe3ad27f2b393a222a34fe9
| -rw-r--r-- | build/allowed_deps.txt | 1 | ||||
| -rw-r--r-- | java/com/android/modules/targetprep/ClasspathFetcher.java | 2 | ||||
| -rw-r--r-- | javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt index 84de5d79..6d29a0f3 100644 --- a/build/allowed_deps.txt +++ b/build/allowed_deps.txt @@ -477,6 +477,7 @@ libbase64_rust(minSdkVersion:29) libbase_headers(minSdkVersion:29) libbase_ndk(minSdkVersion:29) libbinder_headers(minSdkVersion:29) +libbinder_headers_base(minSdkVersion:29) libbinder_headers_platform_shared(minSdkVersion:29) libbinder_ndk_bindgen(minSdkVersion:Tiramisu) libbinder_ndk_sys(minSdkVersion:Tiramisu) diff --git a/java/com/android/modules/targetprep/ClasspathFetcher.java b/java/com/android/modules/targetprep/ClasspathFetcher.java index 78383432..f7796716 100644 --- a/java/com/android/modules/targetprep/ClasspathFetcher.java +++ b/java/com/android/modules/targetprep/ClasspathFetcher.java @@ -46,7 +46,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; -import org.jf.dexlib2.iface.ClassDef; +import com.android.tools.smali.dexlib2.iface.ClassDef; /* * Target preparer that fetches classpath relevant artifacts for a test in a 'reentrant' manner. diff --git a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java index f10cc526..b974c148 100644 --- a/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java +++ b/javatests/com/android/modules/conformanceframework/DuplicateClassesTest.java @@ -28,6 +28,7 @@ import com.android.modules.proto.ClasspathClasses.ClasspathEntry; import com.android.modules.proto.ClasspathClasses.Jar; import com.android.modules.targetprep.ClasspathFetcher; import com.android.modules.utils.build.testing.DeviceSdkLevel; +import com.android.tools.smali.dexlib2.iface.ClassDef; import com.android.tradefed.config.Option; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; @@ -47,7 +48,6 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import org.jf.dexlib2.iface.ClassDef; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; |