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

Commit 42700604 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge "Build test_com.android.adbd.apex."

parents 071c4b37 7da5d8a9

adb/Android.bp

+0 −36
Original line number Diff line number Diff line
@@ -730,39 +730,3 @@ cc_test_host { 
        "fastdeploy/testdata/sample.cd",

    ],

}
 


prebuilt_etc {

    name: "com.android.adbd.ld.config.txt",

    src: "apex/ld.config.txt",

    filename: "ld.config.txt",

    installable: false,

}



apex {

    name: "com.android.adbd",

    manifest: "apex/apex_manifest.json",



    binaries: ["adbd"],

    prebuilts: ["com.android.adbd.init.rc", "com.android.adbd.ld.config.txt"],



    key: "com.android.adbd.key",

    certificate: ":com.android.adbd.certificate",

}



apex_key {

    name: "com.android.adbd.key",

    public_key: "apex/com.android.adbd.avbpubkey",

    private_key: "apex/com.android.adbd.pem",

}



android_app_certificate {

    name: "com.android.adbd.certificate",

    certificate: "apex/com.android.adbd",

}



prebuilt_etc {

    name: "com.android.adbd.init.rc",

    src: "apex/adbd.rc",

    filename: "init.rc",

    installable: false,

}

adb/apex/Android.bp

0 → 100644
+49 −0
Original line number Diff line number Diff line 
apex_defaults {

    name: "com.android.adbd-defaults",



    binaries: ["adbd"],

    prebuilts: ["com.android.adbd.init.rc", "com.android.adbd.ld.config.txt"],



    key: "com.android.adbd.key",

    certificate: ":com.android.adbd.certificate",

}



apex {

    name: "com.android.adbd",

    defaults: ["com.android.adbd-defaults"],

    manifest: "apex_manifest.json",

}



// adbd apex with INT_MAX version code, to allow for upgrade/rollback testing.

apex {

    name: "test_com.android.adbd",

    defaults: ["com.android.adbd-defaults"],

    manifest: "test_apex_manifest.json",

    file_contexts: ":com.android.adbd-file_contexts",

    installable: false,

}



prebuilt_etc {

    name: "com.android.adbd.ld.config.txt",

    src: "ld.config.txt",

    filename: "ld.config.txt",

    installable: false,

}



prebuilt_etc {

    name: "com.android.adbd.init.rc",

    src: "adbd.rc",

    filename: "init.rc",

    installable: false,

}



apex_key {

    name: "com.android.adbd.key",

    public_key: "com.android.adbd.avbpubkey",

    private_key: "com.android.adbd.pem",

}



android_app_certificate {

    name: "com.android.adbd.certificate",

    certificate: "com.android.adbd",

}

adb/apex/test_apex_manifest.json

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{

  "name": "com.android.adbd",

  "version": 2147483647

}