Merge "Update makefiles after AOSP push." (9d4c21f9) · Commits · e / os / android_hardware_interfaces

configstore/1.1/Android.bp

+106 −0

Original line number	Diff line number	Diff line
		@@ -62,3 +62,109 @@ cc_library {
		"android.hardware.configstore@1.0",
		],
		}

		genrule {
		name: "android.hardware.configstore-V1.1-java_gen_java",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",
		srcs: [
		":android.hardware.configstore@1.1_hal",
		],
		out: [
		"android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java",
		],
		}

		java_library {
		name: "android.hardware.configstore-V1.1-java",
		no_framework_libs: true,
		defaults: ["hidl-java-module-defaults"],
		srcs: [":android.hardware.configstore-V1.1-java_gen_java"],
		libs: [
		"hwbinder",
		"android.hardware.configstore-V1.0-java",
		"android.hidl.base-V1.0-java",
		]
		}

		// This package does not export any types. Not creating java constants export.


		genrule {
		name: "android.hardware.configstore@1.1-adapter-helper_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",
		srcs: [
		":android.hardware.configstore@1.1_hal",
		],
		out: [
		"android/hardware/configstore/1.1/ASurfaceFlingerConfigs.cpp",
		],
		}

		genrule {
		name: "android.hardware.configstore@1.1-adapter-helper_genc++_headers",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",
		srcs: [
		":android.hardware.configstore@1.1_hal",
		],
		out: [
		"android/hardware/configstore/1.1/ASurfaceFlingerConfigs.h",
		],
		}

		cc_library {
		name: "android.hardware.configstore@1.1-adapter-helper",
		defaults: ["hidl-module-defaults"],
		generated_sources: ["android.hardware.configstore@1.1-adapter-helper_genc++"],
		generated_headers: ["android.hardware.configstore@1.1-adapter-helper_genc++_headers"],
		export_generated_headers: ["android.hardware.configstore@1.1-adapter-helper_genc++_headers"],
		vendor_available: true,
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libutils",
		"libcutils",
		"libhidladapter",
		"android.hardware.configstore@1.0",
		"android.hardware.configstore@1.1",
		"android.hardware.configstore@1.0-adapter-helper",
		"android.hidl.base@1.0-adapter-helper",
		],
		export_shared_lib_headers: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"libhidladapter",
		"android.hardware.configstore@1.0",
		"android.hardware.configstore@1.1",
		"android.hardware.configstore@1.0-adapter-helper",
		"android.hidl.base@1.0-adapter-helper",
		],
		}

		genrule {
		name: "android.hardware.configstore@1.1-adapter_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.configstore@1.1",
		out: ["main.cpp"]
		}

		cc_test {
		name: "android.hardware.configstore@1.1-adapter",
		defaults: ["hidl-module-defaults"],
		shared_libs: [
		"libhidladapter",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		"android.hardware.configstore@1.0",
		"android.hardware.configstore@1.1",
		"android.hardware.configstore@1.1-adapter-helper",
		],
		generated_sources: ["android.hardware.configstore@1.1-adapter_genc++"],
		}

configstore/1.1/Android.mk

deleted100644 → 0

+0 −44

Original line number	Diff line number	Diff line
		# This file is autogenerated by hidl-gen. Do not edit manually.

		LOCAL_PATH := $(call my-dir)

		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.configstore-V1.1-java
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(call local-generated-sources-dir, COMMON)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

		LOCAL_JAVA_LIBRARIES := \
		android.hardware.configstore-V1.0-java \
		android.hidl.base-V1.0-java \

		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_JAVA_LIBRARIES += core-oj hwbinder

		#
		# Build ISurfaceFlingerConfigs.hal
		#
		GEN := $(intermediates)/android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.configstore@1.1::ISurfaceFlingerConfigs

		$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_JAVA_LIBRARY)



		include $(call all-makefiles-under,$(LOCAL_PATH))

oemlock/1.0/Android.bp

+102 −0

Original line number	Diff line number	Diff line
		@@ -64,3 +64,105 @@ cc_library {
		"libutils",
		],
		}

		genrule {
		name: "android.hardware.oemlock-V1.0-java_gen_java",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0",
		srcs: [
		":android.hardware.oemlock@1.0_hal",
		],
		out: [
		"android/hardware/oemlock/V1_0/OemLockSecureStatus.java",
		"android/hardware/oemlock/V1_0/OemLockStatus.java",
		"android/hardware/oemlock/V1_0/IOemLock.java",
		],
		}

		java_library {
		name: "android.hardware.oemlock-V1.0-java",
		no_framework_libs: true,
		defaults: ["hidl-java-module-defaults"],
		srcs: [":android.hardware.oemlock-V1.0-java_gen_java"],
		libs: [
		"hwbinder",
		"android.hidl.base-V1.0-java",
		]
		}

		// This package does not export any types. Not creating java constants export.


		genrule {
		name: "android.hardware.oemlock@1.0-adapter-helper_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0",
		srcs: [
		":android.hardware.oemlock@1.0_hal",
		],
		out: [
		"android/hardware/oemlock/1.0/AOemLock.cpp",
		],
		}

		genrule {
		name: "android.hardware.oemlock@1.0-adapter-helper_genc++_headers",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0",
		srcs: [
		":android.hardware.oemlock@1.0_hal",
		],
		out: [
		"android/hardware/oemlock/1.0/AOemLock.h",
		],
		}

		cc_library {
		name: "android.hardware.oemlock@1.0-adapter-helper",
		defaults: ["hidl-module-defaults"],
		generated_sources: ["android.hardware.oemlock@1.0-adapter-helper_genc++"],
		generated_headers: ["android.hardware.oemlock@1.0-adapter-helper_genc++_headers"],
		export_generated_headers: ["android.hardware.oemlock@1.0-adapter-helper_genc++_headers"],
		vendor_available: true,
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libutils",
		"libcutils",
		"libhidladapter",
		"android.hardware.oemlock@1.0",
		"android.hidl.base@1.0-adapter-helper",
		],
		export_shared_lib_headers: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"libhidladapter",
		"android.hardware.oemlock@1.0",
		"android.hidl.base@1.0-adapter-helper",
		],
		}

		genrule {
		name: "android.hardware.oemlock@1.0-adapter_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.oemlock@1.0",
		out: ["main.cpp"]
		}

		cc_test {
		name: "android.hardware.oemlock@1.0-adapter",
		defaults: ["hidl-module-defaults"],
		shared_libs: [
		"libhidladapter",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		"android.hardware.oemlock@1.0",
		"android.hardware.oemlock@1.0-adapter-helper",
		],
		generated_sources: ["android.hardware.oemlock@1.0-adapter_genc++"],
		}

oemlock/1.0/Android.mk

deleted100644 → 0

+0 −83

Original line number	Diff line number	Diff line
		# This file is autogenerated by hidl-gen. Do not edit manually.

		LOCAL_PATH := $(call my-dir)

		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.oemlock-V1.0-java
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(call local-generated-sources-dir, COMMON)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

		LOCAL_JAVA_LIBRARIES := \
		android.hidl.base-V1.0-java \

		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_JAVA_LIBRARIES += core-oj hwbinder

		#
		# Build types.hal (OemLockSecureStatus)
		#
		GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockSecureStatus.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.oemlock@1.0::types.OemLockSecureStatus

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (OemLockStatus)
		#
		GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockStatus.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.oemlock@1.0::types.OemLockStatus

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build IOemLock.hal
		#
		GEN := $(intermediates)/android/hardware/oemlock/V1_0/IOemLock.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IOemLock.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava \
		-randroid.hardware:hardware/interfaces \
		-randroid.hidl:system/libhidl/transport \
		android.hardware.oemlock@1.0::IOemLock

		$(GEN): $(LOCAL_PATH)/IOemLock.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_JAVA_LIBRARY)



		include $(call all-makefiles-under,$(LOCAL_PATH))

power/1.1/Android.bp

+108 −0

Original line number	Diff line number	Diff line
		@@ -66,3 +66,111 @@ cc_library {
		"android.hardware.power@1.0",
		],
		}

		genrule {
		name: "android.hardware.power-V1.1-java_gen_java",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1",
		srcs: [
		":android.hardware.power@1.1_hal",
		],
		out: [
		"android/hardware/power/V1_1/PowerStateSubsystem.java",
		"android/hardware/power/V1_1/PowerStateSubsystemSleepState.java",
		"android/hardware/power/V1_1/IPower.java",
		],
		}

		java_library {
		name: "android.hardware.power-V1.1-java",
		no_framework_libs: true,
		defaults: ["hidl-java-module-defaults"],
		srcs: [":android.hardware.power-V1.1-java_gen_java"],
		libs: [
		"hwbinder",
		"android.hardware.power-V1.0-java",
		"android.hidl.base-V1.0-java",
		]
		}

		// This package does not export any types. Not creating java constants export.


		genrule {
		name: "android.hardware.power@1.1-adapter-helper_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1",
		srcs: [
		":android.hardware.power@1.1_hal",
		],
		out: [
		"android/hardware/power/1.1/APower.cpp",
		],
		}

		genrule {
		name: "android.hardware.power@1.1-adapter-helper_genc++_headers",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1",
		srcs: [
		":android.hardware.power@1.1_hal",
		],
		out: [
		"android/hardware/power/1.1/APower.h",
		],
		}

		cc_library {
		name: "android.hardware.power@1.1-adapter-helper",
		defaults: ["hidl-module-defaults"],
		generated_sources: ["android.hardware.power@1.1-adapter-helper_genc++"],
		generated_headers: ["android.hardware.power@1.1-adapter-helper_genc++_headers"],
		export_generated_headers: ["android.hardware.power@1.1-adapter-helper_genc++_headers"],
		vendor_available: true,
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libutils",
		"libcutils",
		"libhidladapter",
		"android.hardware.power@1.0",
		"android.hardware.power@1.1",
		"android.hardware.power@1.0-adapter-helper",
		"android.hidl.base@1.0-adapter-helper",
		],
		export_shared_lib_headers: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"libhidladapter",
		"android.hardware.power@1.0",
		"android.hardware.power@1.1",
		"android.hardware.power@1.0-adapter-helper",
		"android.hidl.base@1.0-adapter-helper",
		],
		}

		genrule {
		name: "android.hardware.power@1.1-adapter_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1",
		out: ["main.cpp"]
		}

		cc_test {
		name: "android.hardware.power@1.1-adapter",
		defaults: ["hidl-module-defaults"],
		shared_libs: [
		"libhidladapter",
		"libhidlbase",
		"libhidltransport",
		"libutils",
		"android.hardware.power@1.0",
		"android.hardware.power@1.1",
		"android.hardware.power@1.1-adapter-helper",
		],
		generated_sources: ["android.hardware.power@1.1-adapter_genc++"],
		}