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

Commit cd904626 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove non-AB unittests"" into main am: 330bd052 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/3086245



Change-Id: I0380098aa2ffacab2761f8c501d9b84cdcad30c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 360806e4 330bd052

Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -35,10 +35,7 @@ package { 
// See: http://go/android-license-faq

license {

    name: "bootable_recovery_license",

    visibility: [

        ":__subpackages__",

        "//bootable/deprecated-ota:__subpackages__",

    ],

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

        "SPDX-license-identifier-MIT",
@@ -178,9 +175,11 @@ cc_binary { 
    required: [

        "e2fsdroid.recovery",

        "init_recovery.rc",

        "librecovery_ui_ext",

        "minadbd",

        "mke2fs.conf.recovery",

        "mke2fs.recovery",

        "recovery_deps",

        "ueventd.rc.recovery",

    ],

}

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -84,3 +84,5 @@ endif 


include $(BUILD_PHONY_PACKAGE)



include \

    $(LOCAL_PATH)/updater/Android.mk \

applypatch/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



soong_namespace {

    imports: [

        "bootable/recovery/edify",

    ],

}



package {

    default_applicable_licenses: ["bootable_recovery_applypatch_license"],

}

edify/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



soong_namespace {}



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

recovery_utils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -98,6 +98,5 @@ cc_library_static { 
        "//bootable/recovery/install",

        "//bootable/recovery/minadbd",

        "//bootable/recovery/tests",

        "//bootable/deprecated-ota:__subpackages__",

    ],

}