diff options
| author | Spandan Das <spandandas@google.com> | 2023-12-19 18:08:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-19 18:08:19 +0000 |
| commit | 349ef8750509e0eb3fb026df2e481f970652b069 (patch) | |
| tree | 239e095859bc81b166e3f12fad2867199c4edc31 /java/java_test.go | |
| parent | 2fd47835841b200d8eea0679b9749b6d71ab5eaa (diff) | |
| parent | fae468ef14fa7fd902c8e004dbd55a3e79b8a30f (diff) | |
Merge changes I3323d993,I01cea895 into main
* changes:
Move validation from FindDeapexerProviderForModule to rdeps
Move dexpreopt processing from java_*_import to prebuilt_apex
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/java/java_test.go b/java/java_test.go index e21018c39..2368b6cfe 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -618,8 +618,6 @@ func TestPrebuilts(t *testing.T) { android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_library", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) entries = android.AndroidMkEntriesForTest(t, ctx, barModule.Module())[0] android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) - entries = android.AndroidMkEntriesForTest(t, ctx, ctx.ModuleForTests("sdklib", "android_common").Module())[0] - android.AssertStringEquals(t, "unexpected LOCAL_SOONG_MODULE_TYPE", "java_sdk_library_import", entries.EntryMap["LOCAL_SOONG_MODULE_TYPE"][0]) } func assertDeepEquals(t *testing.T, message string, expected interface{}, actual interface{}) { |