Merge "Revert "Remove non-AB unittests"" into main (330bd052) · Commits · e / os / android_bootable_recovery

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

+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 \

+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"],
		}

+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

+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__",
		],
		}