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

Commit f2e402d6 authored by Dario Freni's avatar Dario Freni
Browse files

Make CtsShim targets available to cts shim apex. 

Bug: 148489495
Test: mm
Change-Id: I781d0a778b58cb3b96bf421355c29e888f372a56
parent 9c50a64e

packages/CtsShim/build/Android.bp

+20 −1
Original line number Diff line number Diff line
@@ -69,6 +69,14 @@ android_app { 
    // Explicitly uncompress native libs rather than letting the build system doing it and destroy the

    // v2/v3 signature.

    use_embedded_native_libs: true,

    apex_available: [

        "com.android.apex.cts.shim.v1",

        "com.android.apex.cts.shim.v2",

        "com.android.apex.cts.shim.v2_no_hashtree",

        "com.android.apex.cts.shim.v2_legacy",

        "com.android.apex.cts.shim.v2_sdk_target_p",

        "com.android.apex.cts.shim.v3",

    ],

}



//##########################################################
@@ -110,7 +118,10 @@ android_app { 
    dex_preopt: {

        enabled: false,

    },

    manifest: "shim/AndroidManifestTargetPSdk.xml"

    manifest: "shim/AndroidManifestTargetPSdk.xml",

    apex_available: [

        "com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p",

    ],

}



//##########################################################
@@ -128,4 +139,12 @@ android_app { 
    },



    manifest: "shim/AndroidManifest.xml",

    apex_available: [

        "com.android.apex.cts.shim.v1",

        "com.android.apex.cts.shim.v2",

        "com.android.apex.cts.shim.v2_no_hashtree",

        "com.android.apex.cts.shim.v2_legacy",

        "com.android.apex.cts.shim.v2_sdk_target_p",

        "com.android.apex.cts.shim.v3",

    ],

}

packages/CtsShim/build/jni/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -18,4 +18,13 @@ cc_library_shared { 
    name: "libshim_jni",

    srcs: ["Shim.c"],

    sdk_version: "24",

    apex_available: [

        "//apex_available:platform",

        "com.android.apex.cts.shim.v1",

        "com.android.apex.cts.shim.v2",

        "com.android.apex.cts.shim.v2_no_hashtree",

        "com.android.apex.cts.shim.v2_legacy",

        "com.android.apex.cts.shim.v2_sdk_target_p",

        "com.android.apex.cts.shim.v3",

    ],

}