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

Commit 4fdc6f13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Migrate system/core/adb to packages/modules/adb"

parents 4489ee0a 27674470
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -293,8 +293,9 @@ cc_library {
    export_include_dirs: ["."],

    visibility: [
        "//system/core/adb:__subpackages__",
        "//bootable/recovery/minadbd:__subpackages__",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb:__subpackages__",
    ],

    apex_available: [
@@ -499,6 +500,7 @@ cc_library_static {
    ],
    visibility: [
        "//bootable/recovery/minadbd",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb",
    ],
}
@@ -578,6 +580,7 @@ cc_library {
        "com.android.adbd",
    ],
    visibility: [
        "//packages/modules/adb",
        "//system/core/adb",
    ],

@@ -636,6 +639,7 @@ cc_library {

    visibility: [
        "//bootable/recovery/minadbd",
        "//packages/modules/adb",
        "//system/core/adb",
    ],
}
+2 −1
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ cc_defaults {
    export_include_dirs: ["include"],

    visibility: [
        "//system/core/adb:__subpackages__",
        "//bootable/recovery/minadbd:__subpackages__",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb:__subpackages__",
    ],

    host_supported: true,
+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ cc_library {
    defaults: ["adbd_defaults"],
    visibility: [
        "//art:__subpackages__",
        "//packages/modules/adb/apex:__subpackages__",
        "//system/core/adb/apex:__subpackages__",
    ],
    apex_available: [
+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_defaults {

    visibility: [
        "//art:__subpackages__",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb:__subpackages__",
    ],

+4 −2
Original line number Diff line number Diff line
@@ -39,8 +39,9 @@ cc_defaults {

    visibility: [
        "//art:__subpackages__",
        "//system/core/adb:__subpackages__",
        "//frameworks/base/services:__subpackages__",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb:__subpackages__",

        // This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
        "//bootable/recovery/minadbd:__subpackages__",
@@ -129,8 +130,9 @@ cc_defaults {

    visibility: [
        "//art:__subpackages__",
        "//system/core/adb:__subpackages__",
        "//frameworks/base/services:__subpackages__",
        "//packages/modules/adb:__subpackages__",
        "//system/core/adb:__subpackages__",
    ],

    recovery_available: false,
Loading