Revert "Revert "Update radio V1_3 and V1_4 Android.bp.""
This reverts commit 0d2040343396a3760affe6f139d542036e693473.
Reason for revert: Shouldn't be auto-merged
Exempt-From-Owner-Approval: fixing broken build
Change-Id: Ice7d0caecda25b13c9dcb95f28668f37509818a6
diff --git a/radio/V1_3/build/Android.bp b/radio/V1_3/build/Android.bp
index dafc352..9023b6f 100644
--- a/radio/V1_3/build/Android.bp
+++ b/radio/V1_3/build/Android.bp
@@ -12,7 +12,6 @@
"android/hardware/radio/1.3/Radio.vts",
"android/hardware/radio/1.3/RadioIndication.vts",
"android/hardware/radio/1.3/RadioResponse.vts",
- "android/hardware/radio/1.3/types.vts",
],
}
@@ -28,7 +27,6 @@
"android/hardware/radio/1.3/Radio.vts.cpp",
"android/hardware/radio/1.3/RadioIndication.vts.cpp",
"android/hardware/radio/1.3/RadioResponse.vts.cpp",
- "android/hardware/radio/1.3/types.vts.cpp",
],
}
@@ -43,7 +41,6 @@
"android/hardware/radio/1.3/Radio.vts.h",
"android/hardware/radio/1.3/RadioIndication.vts.h",
"android/hardware/radio/1.3/RadioResponse.vts.h",
- "android/hardware/radio/1.3/types.vts.h",
],
}
@@ -57,14 +54,12 @@
"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",
],
}
@@ -80,7 +75,6 @@
"android/hardware/radio/1.3/Radio.vts.cpp",
"android/hardware/radio/1.3/RadioIndication.vts.cpp",
"android/hardware/radio/1.3/RadioResponse.vts.cpp",
- "android/hardware/radio/1.3/types.vts.cpp",
],
}
@@ -95,7 +89,6 @@
"android/hardware/radio/1.3/Radio.vts.h",
"android/hardware/radio/1.3/RadioIndication.vts.h",
"android/hardware/radio/1.3/RadioResponse.vts.h",
- "android/hardware/radio/1.3/types.vts.h",
],
}
@@ -109,14 +102,12 @@
"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/radio/V1_4/build/Android.bp b/radio/V1_4/build/Android.bp
new file mode 100644
index 0000000..ddfeb4b
--- /dev/null
+++ b/radio/V1_4/build/Android.bp
@@ -0,0 +1,126 @@
+// 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.hardware.radio@1.4-vts.spec",
+ hidl_gen_args: "-r android.hardware:hardware/interfaces",
+ srcs: [
+ ":android.hardware.radio@1.4_hal",
+ ],
+ out: [
+ "android/hardware/radio/1.4/Radio.vts",
+ "android/hardware/radio/1.4/RadioIndication.vts",
+ "android/hardware/radio/1.4/RadioResponse.vts",
+ "android/hardware/radio/1.4/types.vts",
+ ],
+}
+
+// Build VTS driver.
+genrule {
+ name: "android.hardware.radio@1.4-vts.driver_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+ srcs: [
+ ":android.hardware.radio@1.4_hal",
+ ],
+ out: [
+ "android/hardware/radio/1.4/Radio.vts.cpp",
+ "android/hardware/radio/1.4/RadioIndication.vts.cpp",
+ "android/hardware/radio/1.4/RadioResponse.vts.cpp",
+ "android/hardware/radio/1.4/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.radio@1.4-vts.driver_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+ srcs: [
+ ":android.hardware.radio@1.4_hal",
+ ],
+ out: [
+ "android/hardware/radio/1.4/Radio.vts.h",
+ "android/hardware/radio/1.4/RadioIndication.vts.h",
+ "android/hardware/radio/1.4/RadioResponse.vts.h",
+ "android/hardware/radio/1.4/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.radio@1.4-vts.driver",
+ generated_sources: ["android.hardware.radio@1.4-vts.driver_genc++"],
+ generated_headers: ["android.hardware.radio@1.4-vts.driver_genc++_headers"],
+ export_generated_headers: ["android.hardware.radio@1.4-vts.driver_genc++_headers"],
+ defaults: ["VtsHalDriverDefaults"],
+ shared_libs: [
+ "android.hardware.radio@1.0-vts.driver",
+ "android.hardware.radio@1.1-vts.driver",
+ "android.hardware.radio@1.2-vts.driver",
+ "android.hardware.radio@1.3-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.hardware.radio@1.4",
+ "android.hidl.safe_union@1.0",
+ ],
+}
+
+// Build VTS profiler.
+genrule {
+ name: "android.hardware.radio@1.4-vts.profiler_genc++",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+ srcs: [
+ ":android.hardware.radio@1.4_hal",
+ ],
+ out: [
+ "android/hardware/radio/1.4/Radio.vts.cpp",
+ "android/hardware/radio/1.4/RadioIndication.vts.cpp",
+ "android/hardware/radio/1.4/RadioResponse.vts.cpp",
+ "android/hardware/radio/1.4/types.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.radio@1.4-vts.profiler_genc++_headers",
+ tools: ["hidl-gen", "vtsc"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Lvts -r android.hardware:hardware/interfaces android.hardware.radio@1.4 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/radio/1.4/ $(genDir)/android/hardware/radio/1.4/",
+ srcs: [
+ ":android.hardware.radio@1.4_hal",
+ ],
+ out: [
+ "android/hardware/radio/1.4/Radio.vts.h",
+ "android/hardware/radio/1.4/RadioIndication.vts.h",
+ "android/hardware/radio/1.4/RadioResponse.vts.h",
+ "android/hardware/radio/1.4/types.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.radio@1.4-vts.profiler",
+ generated_sources: ["android.hardware.radio@1.4-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.radio@1.4-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.radio@1.4-vts.profiler_genc++_headers"],
+ defaults: ["VtsHalProfilerDefaults"],
+ shared_libs: [
+ "android.hardware.radio@1.0-vts.profiler",
+ "android.hardware.radio@1.1-vts.profiler",
+ "android.hardware.radio@1.2-vts.profiler",
+ "android.hardware.radio@1.3-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.hardware.radio@1.4",
+ "android.hidl.safe_union@1.0",
+ ],
+}
+