Merge changes from topic "adbd_apex" am: e24a4b37b4 am: 680129fd2f (f73cc175) · Commits · e / os / android_system_core

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -89,3 +89,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/product_services)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/product_services)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/debug_ramdisk/product_services)
		$(call add-clean-step, find $(PRODUCT_OUT) -type l -name "charger" -print0 \| xargs -0 rm -f)
		$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/bin/adbd)

adb/Android.bp

+50 −51

Original line number	Diff line number	Diff line
		@@ -356,11 +356,11 @@ cc_library_static {
		generated_headers: ["platform_tools_version"],

		static_libs: [
		"libadbconnection_server",
		"libdiagnose_usb",
		],

		shared_libs: [
		"libadbconnection_server",
		"libadbd_auth",
		"libasyncio",
		"libbase",
		@@ -409,12 +409,12 @@ cc_library {
		],

		static_libs: [
		"libadbconnection_server",
		"libadbd_core",
		"libdiagnose_usb",
		],

		shared_libs: [
		"libadbconnection_server",
		"libadbd_auth",
		"libasyncio",
		"libbase",
		@@ -462,6 +462,7 @@ cc_library {
		],

		shared_libs: [
		"libadbconnection_server",
		"libadbd_auth",
		"libadbd_services",
		"libasyncio",
		@@ -495,18 +496,27 @@ cc_binary {
		keep_symbols: true,
		},

		shared_libs: [
		stl: "libc++_static",
		static_libs: [
		"libadbd",
		"libadbd_auth",
		"libadbd_services",
		"libasyncio",
		"libbase",
		"libcap",
		"libcrypto",
		"libcrypto_utils",
		"libcutils",
		"libdiagnose_usb",
		"liblog",
		"libmdnssd",
		"libminijail",
		"libselinux",
		],

		shared_libs: [
		"libadbconnection_server",
		"libcrypto",
		],
		}

		phony {
		@@ -526,53 +536,6 @@ phony {
		],
		}

		cc_binary {
		name: "static_adbd",
		defaults: ["adbd_defaults", "host_adbd_supported"],

		recovery_available: false,
		static_executable: true,
		host_supported: false,

		srcs: [
		"daemon/main.cpp",
		],

		cflags: [
		"-D_GNU_SOURCE",
		"-Wno-deprecated-declarations",
		],

		strip: {
		keep_symbols: true,
		},

		static_libs: [
		"libadbconnection_server",
		"libadbd",
		"libadbd_services",
		"libasyncio",
		"libavb_user",
		"libbase",
		"libbootloader_message",
		"libcap",
		"libcrypto_static",
		"libcrypto_utils",
		"libcutils",
		"libdiagnose_usb",
		"libext4_utils",
		"libfec",
		"libfec_rs",
		"libfs_mgr",
		"liblog",
		"liblp",
		"libmdnssd",
		"libminijail",
		"libselinux",
		"libsquashfs_utils",
		],
		}

		cc_binary {
		name: "abb",

		@@ -765,3 +728,39 @@ 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/adbd.rc

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		service adbd /apex/com.android.adbd/bin/adbd --root_seclabel=u:r:su:s0
		class core
		socket adbd seqpacket 660 system system
		disabled
		override
		seclabel u:r:adbd:s0

adb/apex/apex_manifest.json

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		{
		"name": "com.android.adbd",
		"version": 1
		}

adb/apex/com.android.adbd.avbpubkey

0 → 100644

+1.01 KiB

File added.

No diff preview for this file type.

View file