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

Commit 64515b1f authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "[incremental] change build rules to not to use... 

Merge "Revert "Revert "[incremental] change build rules to not to use aidl_interface""" into sc-dev am: 65de59e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13746168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic623b14a3f8c1b0183a2fbd1033a58f4f3ff2e66
parents f59e2762 65de59e1

Android.bp

+44 −55
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ filegroup { 
genrule {

    name: "statslog-telephony-common-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common"

        + " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",

    cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +

        " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",

    out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],

}
@@ -1161,7 +1161,6 @@ cc_library { 
    },

}





// This is the full proto version of libplatformprotos. It may only

// be used by test code that is not shipped on the device.

cc_library {
@@ -1227,68 +1226,57 @@ filegroup { 
    path: "core/java",

}



aidl_interface {

    name: "libincremental_aidl",

    unstable: true,

cc_defaults {

    name: "incremental_default",

    cflags: [

        "-Wall",

        "-Wextra",

        "-Wextra-semi",

        "-Werror",

        "-Wzero-as-null-pointer-constant",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

    ],

    shared_libs: [

        "libbinder",

        "libutils",

    ],

    aidl: {

        include_dirs: [

            "frameworks/native/aidl/binder",

        ],

        export_aidl_headers: true,

    },

}



cc_library {

    name: "libincremental_aidl-cpp",

    srcs: [

        ":incremental_aidl",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: true,

        },

    },

    defaults: ["incremental_default"],

}



aidl_interface {

    name: "libdataloader_aidl",

    unstable: true,

cc_library {

    name: "libdataloader_aidl-cpp",

    srcs: [

        ":dataloader_aidl",

    ],

    imports: [

        "libincremental_aidl",

    defaults: ["incremental_default"],

    shared_libs: [

        "libincremental_aidl-cpp",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



aidl_interface {

    name: "libincremental_manager_aidl",

    unstable: true,

cc_library {

    name: "libincremental_manager_aidl-cpp",

    srcs: [

        ":incremental_manager_aidl",

    ],

    imports: [

        "libincremental_aidl",

        "libdataloader_aidl",

    defaults: ["incremental_default"],

    shared_libs: [

        "libincremental_aidl-cpp",

        "libdataloader_aidl-cpp",

    ],

    backend: {

        java: {

            sdk_version: "28",

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: false,

        },

    },

}



// TODO(b/77285514): remove this once the last few hidl interfaces have been
@@ -1536,4 +1524,5 @@ java_library { 
        ":protolog-common-src",

    ],

}



// protolog end

PREUPLOAD.cfg

+2 −1
Original line number Diff line number Diff line 
[Builtin Hooks]

clang_format = true

bpfmt = true



[Builtin Hooks Options]

# Only turn on clang-format check for the following subfolders.
@@ -15,7 +16,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               services/incremental/

               tests/

               tools/



bpfmt = -d

[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}