Update makefiles.

am: 69fa1faddd

Change-Id: If236c6a553cdcf0a0ae09e2e1fa1cc25a0c0b356
This commit is contained in:
Tri Vo 2017-02-22 20:33:30 +00:00 committed by android-build-merger
commit 78cefb9454
3 changed files with 12 additions and 120 deletions

View file

@ -1,13 +1,20 @@
// This file is autogenerated by hidl-gen. Do not edit manually. // This file is autogenerated by hidl-gen. Do not edit manually.
filegroup {
name: "android.hardware.renderscript@1.0_hal",
srcs: [
"types.hal",
"IContext.hal",
"IDevice.hal",
],
}
genrule { genrule {
name: "android.hardware.renderscript@1.0_genc++", name: "android.hardware.renderscript@1.0_genc++",
tools: ["hidl-gen"], tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
srcs: [ srcs: [
"types.hal", ":android.hardware.renderscript@1.0_hal",
"IContext.hal",
"IDevice.hal",
], ],
out: [ out: [
"android/hardware/renderscript/1.0/types.cpp", "android/hardware/renderscript/1.0/types.cpp",
@ -21,9 +28,7 @@ genrule {
tools: ["hidl-gen"], tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0", cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0",
srcs: [ srcs: [
"types.hal", ":android.hardware.renderscript@1.0_hal",
"IContext.hal",
"IDevice.hal",
], ],
out: [ out: [
"android/hardware/renderscript/1.0/types.h", "android/hardware/renderscript/1.0/types.h",
@ -62,114 +67,3 @@ cc_library_shared {
"android.hidl.base@1.0", "android.hidl.base@1.0",
], ],
} }
genrule {
name: "android.hardware.renderscript.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.renderscript@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
srcs: [
"types.hal",
"IContext.hal",
"IDevice.hal",
],
out: [
"android/hardware/renderscript/1.0/types.vts.cpp",
"android/hardware/renderscript/1.0/Context.vts.cpp",
"android/hardware/renderscript/1.0/Device.vts.cpp",
],
}
genrule {
name: "android.hardware.renderscript.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.renderscript@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
srcs: [
"types.hal",
"IContext.hal",
"IDevice.hal",
],
out: [
"android/hardware/renderscript/1.0/types.vts.h",
"android/hardware/renderscript/1.0/Context.vts.h",
"android/hardware/renderscript/1.0/Device.vts.h",
],
}
cc_library_shared {
name: "android.hardware.renderscript.vts.driver@1.0",
generated_sources: ["android.hardware.renderscript.vts.driver@1.0_genc++"],
generated_headers: ["android.hardware.renderscript.vts.driver@1.0_genc++_headers"],
export_generated_headers: ["android.hardware.renderscript.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.hidl.base@1.0",
"android.hardware.renderscript@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}
genrule {
name: "android.hardware.renderscript@1.0-vts.profiler_genc++",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
srcs: [
"types.hal",
"IContext.hal",
"IDevice.hal",
],
out: [
"android/hardware/renderscript/1.0/types.vts.cpp",
"android/hardware/renderscript/1.0/Context.vts.cpp",
"android/hardware/renderscript/1.0/Device.vts.cpp",
],
}
genrule {
name: "android.hardware.renderscript@1.0-vts.profiler_genc++_headers",
tools: ["hidl-gen", "vtsc"],
cmd: "$(location hidl-gen) -o $(genDir) -Lvts -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.renderscript@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/renderscript/1.0/ $(genDir)/android/hardware/renderscript/1.0/",
srcs: [
"types.hal",
"IContext.hal",
"IDevice.hal",
],
out: [
"android/hardware/renderscript/1.0/types.vts.h",
"android/hardware/renderscript/1.0/Context.vts.h",
"android/hardware/renderscript/1.0/Device.vts.h",
],
}
cc_library_shared {
name: "android.hardware.renderscript@1.0-vts.profiler",
generated_sources: ["android.hardware.renderscript@1.0-vts.profiler_genc++"],
generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.renderscript@1.0-vts.profiler_genc++_headers"],
shared_libs: [
"libbase",
"libhidlbase",
"libhidltransport",
"libvts_profiling",
"libvts_multidevice_proto",
"libprotobuf-cpp-full",
"android.hidl.base@1.0",
"android.hardware.renderscript@1.0",
],
}

View file

@ -8,7 +8,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.renderscript@1.0-java-constants LOCAL_MODULE := android.hardware.renderscript@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir) intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
# #

View file

@ -63,7 +63,6 @@ cc_library_shared {
"libcutils", "libcutils",
"android.hardware.tests.versioning@1.0", "android.hardware.tests.versioning@1.0",
"android.hardware.tests.versioning@2.2", "android.hardware.tests.versioning@2.2",
"android.hidl.base@1.0",
], ],
export_shared_lib_headers: [ export_shared_lib_headers: [
"libhidlbase", "libhidlbase",
@ -72,6 +71,5 @@ cc_library_shared {
"libutils", "libutils",
"android.hardware.tests.versioning@1.0", "android.hardware.tests.versioning@1.0",
"android.hardware.tests.versioning@2.2", "android.hardware.tests.versioning@2.2",
"android.hidl.base@1.0",
], ],
} }