Update makefiles for safe_union Monostate. am: ed6ffd1678 am: 5ae59862b9
am: 6140097a99
Change-Id: I756e8e5b3716549639961ea93a0b691175fef48d
diff --git a/radio/V1_3/build/Android.bp b/radio/V1_3/build/Android.bp
index 8287754..dafc352 100644
--- a/radio/V1_3/build/Android.bp
+++ b/radio/V1_3/build/Android.bp
@@ -57,12 +57,14 @@
"android.hardware.radio@1.0-vts.driver",
"android.hardware.radio@1.1-vts.driver",
"android.hardware.radio@1.2-vts.driver",
+ "android.hidl.safe_union@1.0-vts.driver",
],
static_libs: [
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",
"android.hardware.radio@1.3",
+ "android.hidl.safe_union@1.0",
],
}
@@ -107,12 +109,14 @@
"android.hardware.radio@1.0-vts.profiler",
"android.hardware.radio@1.1-vts.profiler",
"android.hardware.radio@1.2-vts.profiler",
+ "android.hidl.safe_union@1.0-vts.profiler",
],
static_libs: [
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",
"android.hardware.radio@1.3",
+ "android.hidl.safe_union@1.0",
],
}
diff --git a/system/hidl/safe_union/V1_0/build/Android.bp b/system/hidl/safe_union/V1_0/build/Android.bp
new file mode 100644
index 0000000..2df9de8
--- /dev/null
+++ b/system/hidl/safe_union/V1_0/build/Android.bp
@@ -0,0 +1,89 @@
+// This file was auto-generated. Do not edit manually.
+// Use launch_hal_test.py or update_makefiles.py in test/vts-testcase/hal/script/ to generate this file.
+
+// Generate .vts spec files.
+hal2vts {
+ name: "android.hidl.safe_union@1.0-vts.spec",
+ hidl_gen_args: "-r android.hidl:system/libhidl/transport",
+ srcs: [
+ ":android.hidl.safe_union@1.0_hal",
+ ],
+ out: [
+ "android/hidl/safe_union/1.0/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hidl.safe_union@1.0-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hidl:system/libhidl/transport android.hidl.safe_union@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hidl/safe_union/1.0/ $(genDir)/android/hidl/safe_union/1.0/",
+ srcs: [
+ ":android.hidl.safe_union@1.0_hal",
+ ],
+ out: [
+ "android/hidl/safe_union/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hidl.safe_union@1.0-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hidl:system/libhidl/transport android.hidl.safe_union@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hidl/safe_union/1.0/ $(genDir)/android/hidl/safe_union/1.0/",
+ srcs: [
+ ":android.hidl.safe_union@1.0_hal",
+ ],
+ out: [
+ "android/hidl/safe_union/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hidl.safe_union@1.0-vts.driver",
+ generated_sources: ["android.hidl.safe_union@1.0-vts.driver_genc++"],
+ generated_headers: ["android.hidl.safe_union@1.0-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hidl.safe_union@1.0-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [],
+ static_libs: [
+ "android.hidl.safe_union@1.0",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hidl.safe_union@1.0-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hidl:system/libhidl/transport android.hidl.safe_union@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hidl/safe_union/1.0/ $(genDir)/android/hidl/safe_union/1.0/",
+ srcs: [
+ ":android.hidl.safe_union@1.0_hal",
+ ],
+ out: [
+ "android/hidl/safe_union/1.0/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hidl.safe_union@1.0-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hidl:system/libhidl/transport android.hidl.safe_union@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hidl/safe_union/1.0/ $(genDir)/android/hidl/safe_union/1.0/",
+ srcs: [
+ ":android.hidl.safe_union@1.0_hal",
+ ],
+ out: [
+ "android/hidl/safe_union/1.0/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hidl.safe_union@1.0-vts.profiler",
+ generated_sources: ["android.hidl.safe_union@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hidl.safe_union@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hidl.safe_union@1.0-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [],
+ static_libs: [
+ "android.hidl.safe_union@1.0",
+ ],
+}
+
diff --git a/tests/safeunion/V1_0/build/Android.bp b/tests/safeunion/V1_0/build/Android.bp
index 0869ab5..8dc3b00 100644
--- a/tests/safeunion/V1_0/build/Android.bp
+++ b/tests/safeunion/V1_0/build/Android.bp
@@ -47,9 +47,12 @@
generated_headers: ["android.hardware.tests.safeunion@1.0-vts.driver_genc++_headers"],
export_generated_headers: ["android.hardware.tests.safeunion@1.0-vts.driver_genc++_headers"],
defaults: ["VtsHalDriverDefaults"],
- shared_libs: [],
+ shared_libs: [
+ "android.hidl.safe_union@1.0-vts.driver",
+ ],
static_libs: [
"android.hardware.tests.safeunion@1.0",
+ "android.hidl.safe_union@1.0",
],
}
@@ -86,9 +89,12 @@
generated_headers: ["android.hardware.tests.safeunion@1.0-vts.profiler_genc++_headers"],
export_generated_headers: ["android.hardware.tests.safeunion@1.0-vts.profiler_genc++_headers"],
defaults: ["VtsHalProfilerDefaults"],
- shared_libs: [],
+ shared_libs: [
+ "android.hidl.safe_union@1.0-vts.profiler",
+ ],
static_libs: [
"android.hardware.tests.safeunion@1.0",
+ "android.hidl.safe_union@1.0",
],
}