Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9199bca1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sep28r" 

* changes:
  Add fuzzer for rewritten CursorWindow.
  Rewrite of CursorWindow internals.
parents d2cf9013 256da5a3

libs/androidfw/Android.bp

+22 −2
Original line number Diff line number Diff line
@@ -156,10 +156,11 @@ cc_test { 
            srcs: [

                "tests/BackupData_test.cpp",

                "tests/BackupHelpers_test.cpp",

                "tests/CursorWindow_test.cpp",

                "tests/ObbFile_test.cpp",

                "tests/PosixUtils_test.cpp",

            ],

            shared_libs: common_test_libs + ["libui"],

            shared_libs: common_test_libs + ["libbinder", "liblog", "libui"],

        },

        host: {

            static_libs: common_test_libs + ["liblog", "libz"],
@@ -185,9 +186,28 @@ cc_benchmark { 
        // Actual benchmarks.

        "tests/AssetManager2_bench.cpp",

        "tests/AttributeResolution_bench.cpp",

        "tests/CursorWindow_bench.cpp",

        "tests/SparseEntry_bench.cpp",

        "tests/Theme_bench.cpp",

    ],

    shared_libs: common_test_libs,

    data: ["tests/data/**/*.apk"],

}



cc_library {

    name: "libandroidfw_fuzzer_lib",

    defaults: ["libandroidfw_defaults"],

    host_supported: true,

    srcs: [

        "CursorWindow.cpp",

    ],

    export_include_dirs: ["include"],

    target: {

        android: {

            shared_libs: common_test_libs + ["libbinder", "liblog"],

        },

        host: {

            static_libs: common_test_libs + ["libbinder", "liblog"],

        },

    },

}

libs/androidfw/CursorWindow.cpp

+244 −295

File changed.

Preview size limit exceeded, changes collapsed.

libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
cc_fuzz {

    name: "cursorwindow_fuzzer",

    srcs: [

        "cursorwindow_fuzzer.cpp",

    ],

    host_supported: true,

    corpus: ["corpus/*"],

    static_libs: ["libgmock"],

    target: {

        android: {

            shared_libs: [

                "libandroidfw_fuzzer_lib",

                "libbase",

                "libbinder",

                "libcutils",

                "liblog",

                "libutils",

            ],

        },

        host: {

            static_libs: [

                "libandroidfw_fuzzer_lib",

                "libbase",

                "libbinder",

                "libcutils",

                "liblog",

                "libutils",

            ],

        },

    },

}

libs/androidfw/fuzz/cursorwindow_fuzzer/corpus/typical.bin

0 → 100644
+292 B

File added.

No diff preview for this file type.

View file

libs/androidfw/fuzz/cursorwindow_fuzzer/cursorwindow_fuzzer.cpp

0 → 100644
+78 −0

File added.

Preview size limit exceeded, changes collapsed.