diff options
| -rw-r--r-- | libdexfile/Android.bp | 2 | ||||
| -rw-r--r-- | libdexfile/art_standalone_libdexfile_tests.xml | 1 | ||||
| -rw-r--r-- | runtime/Android.bp | 2 | ||||
| -rw-r--r-- | runtime/art_standalone_runtime_tests.xml | 1 | ||||
| -rw-r--r-- | runtime/fuzzer_corpus_test.cc (renamed from libdexfile/dex/fuzzer_corpus_test.cc) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 84e93e49ef..e18dd2d8ad 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -302,7 +302,6 @@ art_cc_defaults { "dex/dex_file_loader_test.cc", "dex/dex_file_verifier_test.cc", "dex/dex_instruction_test.cc", - "dex/fuzzer_corpus_test.cc", "dex/primitive_test.cc", "dex/proto_reference_test.cc", "dex/string_reference_test.cc", @@ -313,7 +312,6 @@ art_cc_defaults { data: [ ":art-gtest-jars-GetMethodSignature", ":art-gtest-jars-Lookup", - ":art-gtest-jars-DexFuzzerFolder", ":art-gtest-jars-Main", ":art-gtest-jars-MainEmptyUncompressed", ":art-gtest-jars-MultiDex", diff --git a/libdexfile/art_standalone_libdexfile_tests.xml b/libdexfile/art_standalone_libdexfile_tests.xml index 4f18d8ab8b..20a31ddd6f 100644 --- a/libdexfile/art_standalone_libdexfile_tests.xml +++ b/libdexfile/art_standalone_libdexfile_tests.xml @@ -31,7 +31,6 @@ <option name="push" value="art-gtest-jars-MultiDex.jar->/data/local/tmp/art_standalone_libdexfile_tests/art-gtest-jars-MultiDex.jar" /> <option name="push" value="art-gtest-jars-Nested.jar->/data/local/tmp/art_standalone_libdexfile_tests/art-gtest-jars-Nested.jar" /> <option name="push" value="art-gtest-jars-VerifierDeps.dex->/data/local/tmp/art_standalone_libdexfile_tests/art-gtest-jars-VerifierDeps.dex" /> - <option name="push" value="fuzzer_corpus.zip->/data/local/tmp/art_standalone_libdexfile_tests/fuzzer_corpus.zip" /> </target_preparer> <test class="com.android.tradefed.testtype.GTest" > diff --git a/runtime/Android.bp b/runtime/Android.bp index 5c5bcdbd10..fa6a15292d 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -981,6 +981,7 @@ art_cc_defaults { }, data: [ ":art-gtest-jars-AllFields", + ":art-gtest-jars-DexFuzzerFolder", ":art-gtest-jars-ErroneousA", ":art-gtest-jars-ErroneousB", ":art-gtest-jars-ErroneousInit", @@ -1058,6 +1059,7 @@ art_cc_defaults { "entrypoints/quick/quick_trampoline_entrypoints_test.cc", "entrypoints_order_test.cc", "exec_utils_test.cc", + "fuzzer_corpus_test.cc", "gc/accounting/card_table_test.cc", "gc/accounting/mod_union_table_test.cc", "gc/accounting/space_bitmap_test.cc", diff --git a/runtime/art_standalone_runtime_tests.xml b/runtime/art_standalone_runtime_tests.xml index e48db7a26c..50a771709e 100644 --- a/runtime/art_standalone_runtime_tests.xml +++ b/runtime/art_standalone_runtime_tests.xml @@ -62,6 +62,7 @@ <option name="push" value="art-gtest-jars-VerifierDeps.dex->/data/local/tmp/art_standalone_runtime_tests/art-gtest-jars-VerifierDeps.dex" /> <option name="push" value="art-gtest-jars-VerifierDepsMulti.dex->/data/local/tmp/art_standalone_runtime_tests/art-gtest-jars-VerifierDepsMulti.dex" /> <option name="push" value="art-gtest-jars-XandY.jar->/data/local/tmp/art_standalone_runtime_tests/art-gtest-jars-XandY.jar" /> + <option name="push" value="fuzzer_corpus.zip->/data/local/tmp/art_standalone_runtime_tests/fuzzer_corpus.zip" /> </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> diff --git a/libdexfile/dex/fuzzer_corpus_test.cc b/runtime/fuzzer_corpus_test.cc index 24057e536d..24057e536d 100644 --- a/libdexfile/dex/fuzzer_corpus_test.cc +++ b/runtime/fuzzer_corpus_test.cc |