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

Commit bc8a9381 authored by Jooyung Han's avatar Jooyung Han Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sdk-enforce" into rvc-dev 

* changes:
  use libbase as shared_libs
  Set min_sdk_version: 29
parents c3a7ccff fce3ecda

apex/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ apex_defaults { 


    // Use a custom AndroidManifest.xml used for API targeting.

    androidManifest: ":com.android.media-androidManifest",



    min_sdk_version: "29",

    legacy_android10_support: true,

}
@@ -84,7 +84,7 @@ apex_defaults { 


    // Use a custom AndroidManifest.xml used for API targeting.

    androidManifest: ":com.android.media.swcodec-androidManifest",



    min_sdk_version: "29",

    legacy_android10_support: true,

}

media/extractors/midi/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ cc_library { 
        "libsonivox",

        "libstagefright_foundation",

        "libwatchdog",

    ],



    shared_libs: [

        "libbase",

    ]

    ],

}

media/extractors/mpeg2/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ cc_library { 
    ],



    shared_libs: [

        "libbase",

        "libcgrouprc#29",

        "libvndksupport#29",

    ],
@@ -28,7 +29,6 @@ cc_library { 
        "android.hidl.memory@1.0",

        "android.hidl.token@1.0",

        "android.hidl.token@1.0-utils",

        "libbase",

        "libcutils",

        "libhidlbase",

        "libhidlmemory",

media/libwatchdog/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -19,10 +19,8 @@ cc_library { 
    ],

    export_include_dirs: ["include"],

    shared_libs: [

        "liblog",

    ],

    static_libs: [

        "libbase",

        "liblog",

    ],

    target: {

        windows: {