Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ran update-makefiles.sh.

Browse Source 
GNSS/Fingerprint/Graphics have all gotten out of sync.

Bug: 34397031
Test: compiles
Change-Id: Ie0a081a4574fd617d5d97ca30ba879f5284efd64
This commit is contained in:
Steven Moreland
2017-01-18 12:13:38 -08:00
parent 879e6c560e
commit f37a0a439d
5 changed files with 46 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
biometrics/fingerprint/2.1/Android.mk
View File

@@ -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) \

8
gnss/1.0/Android.bp
View File

@@ -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",

38
gnss/1.0/Android.mk
View File

@@ -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)
#

1
graphics/allocator/2.0/Android.bp
View File

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

52
graphics/common/1.0/Android.bp
View File

@@ -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",
],
}