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

Commit a0f9f9bc authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Automerger Merge Worker
Browse files

Merge "Format Android.bp files" into main am: eb218442 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3213313



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

drm/mediadrm/plugins/clearkey/aidl/Android.bp

+15 −7
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ cc_defaults { 
    name: "aidl_clearkey_service_defaults-use-shared-deps",



    shared_libs: [

        "android.hardware.drm-V1-ndk",

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "liblog",

        "libprotobuf-cpp-lite",

        "libutils",

        "android.hardware.drm-V1-ndk",

    ],



    static_libs: [
@@ -62,7 +62,11 @@ cc_defaults { 


    relative_install_path: "hw",



    cflags: ["-Wall", "-Werror", "-Wthread-safety"],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wthread-safety",

    ],



    include_dirs: ["frameworks/av/include"],
@@ -137,18 +141,22 @@ cc_defaults { 


    relative_install_path: "hw",



    cflags: ["-Wall", "-Werror", "-Wthread-safety"],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wthread-safety",

    ],



    include_dirs: ["frameworks/av/include"],



    shared_libs: [

        "android.hardware.drm-V1-ndk",

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "liblog",

        "libprotobuf-cpp-lite",

        "libutils",

        "android.hardware.drm-V1-ndk",

    ],



    static_libs: [
@@ -192,7 +200,7 @@ apex { 
    ],

    prebuilts: [

        "android.hardware.drm-service.clearkey.apex.rc",

        "android.hardware.drm-service.clearkey.xml"

        "android.hardware.drm-service.clearkey.xml",

    ],

    overrides: [

        "android.hardware.drm-service.clearkey",
@@ -233,11 +241,11 @@ apex { 
    ],

    prebuilts: [

        "android.hardware.drm-service-lazy.clearkey.apex.rc",

        "android.hardware.drm-service.clearkey.xml"

        "android.hardware.drm-service.clearkey.xml",

    ],

    overrides: [

        "android.hardware.drm-service.clearkey",

        "android.hardware.drm-service-lazy.clearkey",

        "android.hardware.drm-service.clearkey",

        "com.android.hardware.drm.clearkey",

    ],

}

services/oboeservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ cc_defaults { 
    shared_libs: [

        "aaudio-aidl-cpp",

        "com.android.media.aaudio-aconfig-cc",

        "com.android.media.aaudio-aconfig-cc",

        "framework-permission-aidl-cpp",

        "libaaudio_internal",

        "libaudioclient",