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

Commit 0979162b authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Make hwbinder stubs use a filegroup for srcs" am: 14bd8b5d am:... 

Merge "Make hwbinder stubs use a filegroup for srcs" am: 14bd8b5d am: cf143f36 am: c5bc1deb am: fa09f4f1 am: bc36761b

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



Change-Id: Id8f2bacdd5fc57ca24fde8cb7f1c3564fe12f41e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d81d5a35 bc36761b

StubLibraries.bp

+1 −14
Original line number Original line Diff line number Diff line
@@ -575,20 +575,7 @@ droidstubs { 




droidstubs {

droidstubs {

    name: "hwbinder-stubs-docs",

    name: "hwbinder-stubs-docs",

    srcs: [

    srcs: [":hwbinder-stubs-srcs"],

        "core/java/android/os/HidlSupport.java",

        "core/java/android/os/HidlMemory.java",

        "core/java/android/os/HwBinder.java",

        "core/java/android/os/HwBlob.java",

        "core/java/android/os/HwParcel.java",

        "core/java/android/os/IHwBinder.java",

        "core/java/android/os/IHwInterface.java",

        "core/java/android/os/DeadObjectException.java",

        "core/java/android/os/DeadSystemException.java",

        "core/java/android/os/NativeHandle.java",

        "core/java/android/os/RemoteException.java",

        "core/java/android/util/AndroidException.java",

    ],

    libs: ["framework-annotations-lib"],

    libs: ["framework-annotations-lib"],

    installable: false,

    installable: false,

    sdk_version: "core_platform",

    sdk_version: "core_platform",

core/java/Android.bp

+22 −0
Original line number Original line Diff line number Diff line
@@ -285,6 +285,28 @@ filegroup { 
    ],

    ],

}

}





filegroup {

    name: "hwbinder-stubs-srcs",

    srcs: [

        "android/os/HidlSupport.java",

        "android/os/HidlMemory.java",

        "android/os/HwBinder.java",

        "android/os/HwBlob.java",

        "android/os/HwParcel.java",

        "android/os/IHwBinder.java",

        "android/os/IHwInterface.java",

        "android/os/DeadObjectException.java",

        "android/os/DeadSystemException.java",

        "android/os/NativeHandle.java",

        "android/os/RemoteException.java",

        "android/util/AndroidException.java",

    ],

    visibility: [

        "//frameworks/base",

        "//frameworks/base/api",

    ],

}



cc_defaults {

cc_defaults {

    name: "incremental_default",

    name: "incremental_default",

    cflags: [

    cflags: [