Merge "Revert "[incremental] change build rules to not to use aidl_interface"" into sc-dev (291b7c00) · Commits · e / os / android_frameworks_base

Android.bp

+55 −45

Original line number	Diff line number	Diff line
		@@ -344,8 +344,8 @@ filegroup {
		genrule {
		name: "statslog-telephony-common-java-gen",
		tools: ["stats-log-api-gen"],
		cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common" +
		" --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
		cmd: "$(location stats-log-api-gen) --java $(out) --module telephony_common"
		+ " --javaPackage com.android.internal.telephony --javaClass TelephonyCommonStatsLog",
		out: ["com/android/internal/telephony/TelephonyCommonStatsLog.java"],
		}

		@@ -1159,6 +1159,7 @@ cc_library {
		},
		}


		// This is the full proto version of libplatformprotos. It may only
		// be used by test code that is not shipped on the device.
		cc_library {
		@@ -1224,58 +1225,68 @@ filegroup {
		path: "core/java",
		}

		cc_defaults {
		name: "incremental_default",
		host_supported: true,
		cflags: [
		"-Wall",
		"-Wextra",
		"-Wextra-semi",
		"-Werror",
		"-Wzero-as-null-pointer-constant",
		"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
		],
		shared_libs: [
		"libbinder",
		"libutils",
		],
		aidl: {
		include_dirs: [
		"frameworks/native/aidl/binder",
		],
		export_aidl_headers: true,
		},
		}

		cc_library {
		name: "libincremental_aidl-cpp",
		aidl_interface {
		name: "libincremental_aidl",
		unstable: true,
		srcs: [
		":incremental_aidl",
		],
		defaults: ["incremental_default"],
		backend: {
		java: {
		sdk_version: "28",
		},
		cpp: {
		enabled: true,
		},
		ndk: {
		enabled: true,
		},
		},
		}

		cc_library {
		name: "libdataloader_aidl-cpp",
		aidl_interface {
		name: "libdataloader_aidl",
		unstable: true,
		srcs: [
		":dataloader_aidl",
		],
		defaults: ["incremental_default"],
		shared_libs: [
		"libincremental_aidl-cpp",
		imports: [
		"libincremental_aidl",
		],
		backend: {
		java: {
		sdk_version: "28",
		},
		cpp: {
		enabled: true,
		},
		ndk: {
		enabled: false,
		},
		},
		}

		cc_library {
		name: "libincremental_manager_aidl-cpp",
		aidl_interface {
		name: "libincremental_manager_aidl",
		unstable: true,
		srcs: [
		":incremental_manager_aidl",
		],
		defaults: ["incremental_default"],
		shared_libs: [
		"libincremental_aidl-cpp",
		"libdataloader_aidl-cpp",
		imports: [
		"libincremental_aidl",
		"libdataloader_aidl",
		],
		backend: {
		java: {
		sdk_version: "28",
		},
		cpp: {
		enabled: true,
		},
		ndk: {
		enabled: false,
		},
		},
		}

		// TODO(b/77285514): remove this once the last few hidl interfaces have been
		@@ -1523,5 +1534,4 @@ java_library {
		":protolog-common-src",
		],
		}

		// protolog end

PREUPLOAD.cfg

+1 −2

Original line number	Diff line number	Diff line
		[Builtin Hooks]
		clang_format = true
		bpfmt = true

		[Builtin Hooks Options]
		# Only turn on clang-format check for the following subfolders.
		@@ -16,7 +15,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		services/incremental/
		tests/
		tools/
		bpfmt = -d

		[Hook Scripts]
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}