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

Commit 68bd5305 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make CtsShim targets available to cts shim apex." into rvc-dev am: 2bc67bea am: 9a941d69 

Change-Id: I6ecb6b8b923ab6d4e0b48572652cffe752ed8470
parents 3c5d7305 9a941d69

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

    ],

}