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

Commit 30acd9fb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Mark updatable APEXes" into rvc-dev am: 71796e31 am: 522e2529 am: 428767f3 

Change-Id: I73d2df8c79f6f3781690cf8ccf7d8982f73a5d32
parents f1c48eb8 428767f3

apex/extservices/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ apex { 




apex_defaults {

apex_defaults {

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

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

    updatable: true,

    key: "com.android.extservices.key",

    key: "com.android.extservices.key",

    certificate: ":com.android.extservices.certificate",

    certificate: ":com.android.extservices.certificate",

    apps: ["ExtServices"],

    apps: ["ExtServices"],

apex/permission/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ apex { 




apex_defaults {

apex_defaults {

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

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

    updatable: true,

    key: "com.android.permission.key",

    key: "com.android.permission.key",

    certificate: ":com.android.permission.certificate",

    certificate: ":com.android.permission.certificate",

    java_libs: [

    java_libs: [

apex/sdkextensions/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ apex { 




apex_defaults {

apex_defaults {

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

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

    updatable: true,

    java_libs: [ "framework-sdkextensions" ],

    java_libs: [ "framework-sdkextensions" ],

    prebuilts: [

    prebuilts: [

        "derive_sdk.rc",

        "derive_sdk.rc",

apex/statsd/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ apex_defaults { 
    compile_multilib: "both",

    compile_multilib: "both",

    prebuilts: ["com.android.os.statsd.init.rc"],

    prebuilts: ["com.android.os.statsd.init.rc"],

    name: "com.android.os.statsd-defaults",

    name: "com.android.os.statsd-defaults",

    updatable: true,

    key: "com.android.os.statsd.key",

    key: "com.android.os.statsd.key",

    certificate: ":com.android.os.statsd.certificate",

    certificate: ":com.android.os.statsd.certificate",

}

}

packages/Tethering/apex/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




apex {

apex {

    name: "com.android.tethering",

    name: "com.android.tethering",

    updatable: true,

    java_libs: ["framework-tethering"],

    java_libs: ["framework-tethering"],

    apps: ["Tethering"],

    apps: ["Tethering"],

    manifest: "manifest.json",

    manifest: "manifest.json",