Merge "Match src paths with aidl package name" (1f1d0260) · Commits · e / os / android_frameworks_native

cmds/installd/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ filegroup {
		srcs: [
		"binder/android/os/IInstalld.aidl",
		],
		path: "binder",
		}

		//

+1 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ filegroup {
		srcs: [
		"aidl/android/content/pm/IPackageManagerNative.aidl",
		],
		path: "aidl",
		}

		subdirs = ["tests"]

+0 −31

Original line number	Diff line number	Diff line
		subdirs = [
		"libthermalcallback"
		]

		cc_library {
		name: "libthermalservice",

		srcs: [
		"aidl/android/os/IThermalEventListener.aidl",
		"aidl/android/os/IThermalService.aidl",
		"aidl/android/os/Temperature.cpp",
		],
		aidl: {
		include_dirs: ["frameworks/native/services/thermalservice/aidl"],
		export_aidl_headers: true,
		},
		export_include_dirs: ["aidl"],

		shared_libs: [
		"libbinder",
		"libutils",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wunused",
		"-Wunreachable-code",
		],
		}

		cc_binary {
		name: "thermalserviced",

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		cc_library {
		name: "libthermalservice",

		srcs: [
		"android/os/IThermalEventListener.aidl",
		"android/os/IThermalService.aidl",
		"android/os/Temperature.cpp",
		],
		aidl: {
		local_include_dirs: ["."],
		export_aidl_headers: true,
		},
		export_include_dirs: ["."],

		shared_libs: [
		"libbinder",
		"libutils",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wunused",
		"-Wunreachable-code",
		],
		}

+126 −154

Original line number	Diff line number	Diff line
		@@ -59,34 +59,6 @@ cc_library_shared {

		}

		cc_library_static {
		name: "libvr_hwc-binder",
		srcs: [
		"aidl/android/dvr/IVrComposer.aidl",
		"aidl/android/dvr/IVrComposerCallback.aidl",
		"aidl/android/dvr/parcelable_composer_frame.cpp",
		"aidl/android/dvr/parcelable_composer_layer.cpp",
		"aidl/android/dvr/parcelable_unique_fd.cpp",
		],
		aidl: {
		include_dirs: ["frameworks/native/services/vr/hardware_composer/aidl"],
		export_aidl_headers: true,
		},
		export_include_dirs: ["aidl"],

		cflags: [
		"-Wall",
		"-Werror",
		],

		shared_libs: [
		"libbinder",
		"libui",
		"libutils",
		"libvr_hwc-hal",
		],
		}

		cc_library_static {
		name: "libvr_hwc-impl",
		srcs: [
		@@ -116,7 +88,7 @@ cc_library_static {
		cc_binary {
		name: "vr_hwc",
		srcs: [
		"vr_hardware_composer_service.cpp"
		"vr_hardware_composer_service.cpp",
		],
		static_libs: [
		"libvr_hwc-impl",