Merge "Ran update-makefiles.sh." (b8e69a9d) · Commits · e / os / android_hardware_interfaces

biometrics/fingerprint/2.1/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,8 @@ GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometrics
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.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) \
		@@ -446,6 +448,8 @@ GEN := $(intermediates)/android/hardware/biometrics/fingerprint/V2_1/IBiometrics
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBiometricsFingerprintClientCallback.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) \

gnss/1.0/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -108,13 +108,13 @@ genrule {
		"android/hardware/gnss/1.0/BsGnss.h",
		"android/hardware/gnss/1.0/IGnssBatching.h",
		"android/hardware/gnss/1.0/IHwGnssBatching.h",
		"android/hardware/gnss/1.0/BnGnssBatching.h",
		"android/hardware/gnss/1.0/BpGnssBatching.h",
		"android/hardware/gnss/1.0/BnHwGnssBatching.h",
		"android/hardware/gnss/1.0/BpHwGnssBatching.h",
		"android/hardware/gnss/1.0/BsGnssBatching.h",
		"android/hardware/gnss/1.0/IGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/IHwGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/BnGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/BpGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/BnHwGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/BpHwGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/BsGnssBatchingCallback.h",
		"android/hardware/gnss/1.0/IGnssCallback.h",
		"android/hardware/gnss/1.0/IHwGnssCallback.h",

gnss/1.0/Android.mk

+38 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (GnssLocationFlags)
		#
		GEN := $(intermediates)/android/hardware/gnss/V1_0/GnssLocationFlags.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.gnss@1.0::types.GnssLocationFlags

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

		#
		# Build types.hal (GnssMax)
		#
		@@ -557,6 +576,25 @@ $(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (GnssLocationFlags)
		#
		GEN := $(intermediates)/android/hardware/gnss/V1_0/GnssLocationFlags.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.gnss@1.0::types.GnssLocationFlags

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

		#
		# Build types.hal (GnssMax)
		#

graphics/allocator/2.0/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -220,4 +220,3 @@ cc_library_shared {
		"android.hardware.graphics.allocator@2.0",
		],
		}

graphics/common/1.0/Android.bp

+0 −52

Original line number	Diff line number	Diff line
		@@ -44,55 +44,3 @@ cc_library_shared {
		"libutils",
		],
		}

		genrule {
		name: "android.hardware.graphics.common.vts.driver@1.0_genc++",
		tools: ["hidl-gen", "vtsc"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
		srcs: [
		"types.hal",
		],
		out: [
		"android/hardware/graphics/common/1.0/types.vts.cpp",
		],
		}

		genrule {
		name: "android.hardware.graphics.common.vts.driver@1.0_genc++_headers",
		tools: ["hidl-gen", "vtsc"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.graphics.common@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/graphics/common/1.0/ $(genDir)/android/hardware/graphics/common/1.0/",
		srcs: [
		"types.hal",
		],
		out: [
		"android/hardware/graphics/common/1.0/types.vts.h",
		],
		}

		cc_library_shared {
		name: "android.hardware.graphics.common.vts.driver@1.0",
		generated_sources: ["android.hardware.graphics.common.vts.driver@1.0_genc++"],
		generated_headers: ["android.hardware.graphics.common.vts.driver@1.0_genc++_headers"],
		export_generated_headers: ["android.hardware.graphics.common.vts.driver@1.0_genc++_headers"],
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"liblog",
		"libutils",
		"libcutils",
		"libvts_common",
		"libvts_datatype",
		"libvts_measurement",
		"libvts_multidevice_proto",
		"libcamera_metadata",
		"libprotobuf-cpp-full",
		"android.hardware.graphics.common@1.0",
		],
		export_shared_lib_headers: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		],
		}
		No newline at end of file