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

Commit 25d2cafe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding AIDL fuzzer for installd" am: 8a4c11e2 am: f5c94c4c am:... 

Merge "Adding AIDL fuzzer for installd" am: 8a4c11e2 am: f5c94c4c am: 371047a1 am: 1b66f5be am: 4e862d47

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2595106



Change-Id: I5034a8dfd98fe1a079858810fe17b1d3012a0304
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7835b307 4e862d47

cmds/installd/tests/Android.bp

+26 −6
Original line number Diff line number Diff line
@@ -77,10 +77,8 @@ cc_test { 
    },

}



cc_test {

    name: "installd_service_test",

    test_suites: ["device-tests"],

    srcs: ["installd_service_test.cpp"],

cc_defaults {

    name: "installd_service_test_defaults",

    cflags: [

        "-Wall",

        "-Werror",
@@ -106,8 +104,6 @@ cc_test { 
        "liblogwrap",

        "libc++fs",

    ],

    test_config: "installd_service_test.xml",



    product_variables: {

        arc: {

            exclude_srcs: [
@@ -124,6 +120,14 @@ cc_test { 
    },

}



cc_test {

    name: "installd_service_test",

    test_suites: ["device-tests"],

    srcs: ["installd_service_test.cpp"],

    defaults: ["installd_service_test_defaults"],

    test_config: "installd_service_test.xml",

}



cc_test {

    name: "installd_dexopt_test",

    test_suites: ["device-tests"],
@@ -209,3 +213,19 @@ cc_test { 
        "liblog",

    ],

}



cc_fuzz {

    name: "installd_service_fuzzer",

    defaults: [

        "service_fuzzer_defaults",

        "fuzzer_disable_leaks",

        "installd_service_test_defaults",

    ],

    srcs: ["fuzzers/InstalldServiceFuzzer.cpp"],

    fuzz_config: {

        cc: [

            "android-package-manager-team@google.com",

        ],

        triage_assignee: "waghpawan@google.com",

    },

}

cmds/installd/tests/fuzzers/InstalldServiceFuzzer.cpp

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#include <fuzzbinder/libbinder_driver.h>



#include "InstalldNativeService.h"

#include "dexopt.h"



using ::android::fuzzService;

using ::android::sp;

using ::android::installd::InstalldNativeService;



namespace android {

namespace installd {



bool calculate_oat_file_path(char path[PKG_PATH_MAX], const char* oat_dir, const char* apk_path,

                             const char* instruction_set) {

    return calculate_oat_file_path_default(path, oat_dir, apk_path, instruction_set);

}



bool calculate_odex_file_path(char path[PKG_PATH_MAX], const char* apk_path,

                              const char* instruction_set) {

    return calculate_odex_file_path_default(path, apk_path, instruction_set);

}



bool create_cache_path(char path[PKG_PATH_MAX], const char* src, const char* instruction_set) {

    return create_cache_path_default(path, src, instruction_set);

}



bool force_compile_without_image() {

    return false;

}



} // namespace installd

} // namespace android



extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {

    auto service = sp<InstalldNativeService>::make();

    fuzzService(service, FuzzedDataProvider(data, size));

    return 0;

}
 
 No newline at end of file