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

Commit eb218442 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Format Android.bp files" into main

parents 6fe6b438 ac6572ac

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",

    ],

}

media/audio/aconfig/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ cc_aconfig_library { 
    // TODO(b/316909431) native_bridge_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

        "com.android.media",

        "com.android.media.swcodec",

        "com.android.btservices",

    ],

    min_sdk_version: "29",

}

services/oboeservice/Android.bp

+1 −1
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",
@@ -98,7 +99,6 @@ cc_defaults { 
        "libmediautils",

        "libutils",

        "packagemanager_aidl-cpp",

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

    ],



    static_libs: [