Update Andriod.bp for hals.
* Add driver/profiler build rule for all hals.
Test: mma
Change-Id: I98325f7af14fec7dd1bb64b1668de8c7c20ace92
diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp
index 4d7e26e..4fc3038 100644
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -206,3 +206,258 @@
"android.hidl.base@1.0",
],
}
+
+genrule {
+ name: "android.hardware.gnss.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.gnss@1.0 && $(location vtsc) -mDRIVER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+ srcs: [
+ "types.hal",
+ "IAGnss.hal",
+ "IAGnssCallback.hal",
+ "IAGnssRil.hal",
+ "IAGnssRilCallback.hal",
+ "IGnss.hal",
+ "IGnssBatching.hal",
+ "IGnssBatchingCallback.hal",
+ "IGnssCallback.hal",
+ "IGnssConfiguration.hal",
+ "IGnssDebug.hal",
+ "IGnssGeofenceCallback.hal",
+ "IGnssGeofencing.hal",
+ "IGnssMeasurement.hal",
+ "IGnssMeasurementCallback.hal",
+ "IGnssNavigationMessage.hal",
+ "IGnssNavigationMessageCallback.hal",
+ "IGnssNi.hal",
+ "IGnssNiCallback.hal",
+ "IGnssXtra.hal",
+ "IGnssXtraCallback.hal",
+ ],
+ out: [
+ "android/hardware/gnss/1.0/types.vts.cpp",
+ "android/hardware/gnss/1.0/AGnss.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssCallback.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssRil.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssRilCallback.vts.cpp",
+ "android/hardware/gnss/1.0/Gnss.vts.cpp",
+ "android/hardware/gnss/1.0/GnssBatching.vts.cpp",
+ "android/hardware/gnss/1.0/GnssBatchingCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssConfiguration.vts.cpp",
+ "android/hardware/gnss/1.0/GnssDebug.vts.cpp",
+ "android/hardware/gnss/1.0/GnssGeofenceCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssGeofencing.vts.cpp",
+ "android/hardware/gnss/1.0/GnssMeasurement.vts.cpp",
+ "android/hardware/gnss/1.0/GnssMeasurementCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNavigationMessage.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNavigationMessageCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNi.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNiCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssXtra.vts.cpp",
+ "android/hardware/gnss/1.0/GnssXtraCallback.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.gnss.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.gnss@1.0 && $(location vtsc) -mDRIVER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+ srcs: [
+ "types.hal",
+ "IAGnss.hal",
+ "IAGnssCallback.hal",
+ "IAGnssRil.hal",
+ "IAGnssRilCallback.hal",
+ "IGnss.hal",
+ "IGnssBatching.hal",
+ "IGnssBatchingCallback.hal",
+ "IGnssCallback.hal",
+ "IGnssConfiguration.hal",
+ "IGnssDebug.hal",
+ "IGnssGeofenceCallback.hal",
+ "IGnssGeofencing.hal",
+ "IGnssMeasurement.hal",
+ "IGnssMeasurementCallback.hal",
+ "IGnssNavigationMessage.hal",
+ "IGnssNavigationMessageCallback.hal",
+ "IGnssNi.hal",
+ "IGnssNiCallback.hal",
+ "IGnssXtra.hal",
+ "IGnssXtraCallback.hal",
+ ],
+ out: [
+ "android/hardware/gnss/1.0/types.vts.h",
+ "android/hardware/gnss/1.0/AGnss.vts.h",
+ "android/hardware/gnss/1.0/AGnssCallback.vts.h",
+ "android/hardware/gnss/1.0/AGnssRil.vts.h",
+ "android/hardware/gnss/1.0/AGnssRilCallback.vts.h",
+ "android/hardware/gnss/1.0/Gnss.vts.h",
+ "android/hardware/gnss/1.0/GnssBatching.vts.h",
+ "android/hardware/gnss/1.0/GnssBatchingCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssConfiguration.vts.h",
+ "android/hardware/gnss/1.0/GnssDebug.vts.h",
+ "android/hardware/gnss/1.0/GnssGeofenceCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssGeofencing.vts.h",
+ "android/hardware/gnss/1.0/GnssMeasurement.vts.h",
+ "android/hardware/gnss/1.0/GnssMeasurementCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssNavigationMessage.vts.h",
+ "android/hardware/gnss/1.0/GnssNavigationMessageCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssNi.vts.h",
+ "android/hardware/gnss/1.0/GnssNiCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssXtra.vts.h",
+ "android/hardware/gnss/1.0/GnssXtraCallback.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.gnss.vts.driver@1.0",
+ generated_sources: ["android.hardware.gnss.vts.driver@1.0_genc++"],
+ generated_headers: ["android.hardware.gnss.vts.driver@1.0_genc++_headers"],
+ export_generated_headers: ["android.hardware.gnss.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.gnss@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
+
+genrule {
+ name: "android.hardware.gnss@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.gnss@1.0 && $(location vtsc) -mPROFILER -tSOURCE -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+ srcs: [
+ "types.hal",
+ "IAGnss.hal",
+ "IAGnssCallback.hal",
+ "IAGnssRil.hal",
+ "IAGnssRilCallback.hal",
+ "IGnss.hal",
+ "IGnssBatching.hal",
+ "IGnssBatchingCallback.hal",
+ "IGnssCallback.hal",
+ "IGnssConfiguration.hal",
+ "IGnssDebug.hal",
+ "IGnssGeofenceCallback.hal",
+ "IGnssGeofencing.hal",
+ "IGnssMeasurement.hal",
+ "IGnssMeasurementCallback.hal",
+ "IGnssNavigationMessage.hal",
+ "IGnssNavigationMessageCallback.hal",
+ "IGnssNi.hal",
+ "IGnssNiCallback.hal",
+ "IGnssXtra.hal",
+ "IGnssXtraCallback.hal",
+ ],
+ out: [
+ "android/hardware/gnss/1.0/types.vts.cpp",
+ "android/hardware/gnss/1.0/AGnss.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssCallback.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssRil.vts.cpp",
+ "android/hardware/gnss/1.0/AGnssRilCallback.vts.cpp",
+ "android/hardware/gnss/1.0/Gnss.vts.cpp",
+ "android/hardware/gnss/1.0/GnssBatching.vts.cpp",
+ "android/hardware/gnss/1.0/GnssBatchingCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssConfiguration.vts.cpp",
+ "android/hardware/gnss/1.0/GnssDebug.vts.cpp",
+ "android/hardware/gnss/1.0/GnssGeofenceCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssGeofencing.vts.cpp",
+ "android/hardware/gnss/1.0/GnssMeasurement.vts.cpp",
+ "android/hardware/gnss/1.0/GnssMeasurementCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNavigationMessage.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNavigationMessageCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNi.vts.cpp",
+ "android/hardware/gnss/1.0/GnssNiCallback.vts.cpp",
+ "android/hardware/gnss/1.0/GnssXtra.vts.cpp",
+ "android/hardware/gnss/1.0/GnssXtraCallback.vts.cpp",
+ ],
+}
+
+genrule {
+ name: "android.hardware.gnss@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.gnss@1.0 && $(location vtsc) -mPROFILER -tHEADER -b$(genDir) android/hardware/gnss/1.0/ $(genDir)/android/hardware/gnss/1.0/",
+ srcs: [
+ "types.hal",
+ "IAGnss.hal",
+ "IAGnssCallback.hal",
+ "IAGnssRil.hal",
+ "IAGnssRilCallback.hal",
+ "IGnss.hal",
+ "IGnssBatching.hal",
+ "IGnssBatchingCallback.hal",
+ "IGnssCallback.hal",
+ "IGnssConfiguration.hal",
+ "IGnssDebug.hal",
+ "IGnssGeofenceCallback.hal",
+ "IGnssGeofencing.hal",
+ "IGnssMeasurement.hal",
+ "IGnssMeasurementCallback.hal",
+ "IGnssNavigationMessage.hal",
+ "IGnssNavigationMessageCallback.hal",
+ "IGnssNi.hal",
+ "IGnssNiCallback.hal",
+ "IGnssXtra.hal",
+ "IGnssXtraCallback.hal",
+ ],
+ out: [
+ "android/hardware/gnss/1.0/types.vts.h",
+ "android/hardware/gnss/1.0/AGnss.vts.h",
+ "android/hardware/gnss/1.0/AGnssCallback.vts.h",
+ "android/hardware/gnss/1.0/AGnssRil.vts.h",
+ "android/hardware/gnss/1.0/AGnssRilCallback.vts.h",
+ "android/hardware/gnss/1.0/Gnss.vts.h",
+ "android/hardware/gnss/1.0/GnssBatching.vts.h",
+ "android/hardware/gnss/1.0/GnssBatchingCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssConfiguration.vts.h",
+ "android/hardware/gnss/1.0/GnssDebug.vts.h",
+ "android/hardware/gnss/1.0/GnssGeofenceCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssGeofencing.vts.h",
+ "android/hardware/gnss/1.0/GnssMeasurement.vts.h",
+ "android/hardware/gnss/1.0/GnssMeasurementCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssNavigationMessage.vts.h",
+ "android/hardware/gnss/1.0/GnssNavigationMessageCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssNi.vts.h",
+ "android/hardware/gnss/1.0/GnssNiCallback.vts.h",
+ "android/hardware/gnss/1.0/GnssXtra.vts.h",
+ "android/hardware/gnss/1.0/GnssXtraCallback.vts.h",
+ ],
+}
+
+cc_library_shared {
+ name: "android.hardware.gnss@1.0-vts.profiler",
+ generated_sources: ["android.hardware.gnss@1.0-vts.profiler_genc++"],
+ generated_headers: ["android.hardware.gnss@1.0-vts.profiler_genc++_headers"],
+ export_generated_headers: ["android.hardware.gnss@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.gnss@1.0",
+ ],
+}
diff --git a/gnss/1.0/Android.mk b/gnss/1.0/Android.mk
index 130c14e..98c547c 100644
--- a/gnss/1.0/Android.mk
+++ b/gnss/1.0/Android.mk
@@ -1046,5 +1046,58 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
+################################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android.hardware.gnss@1.0-java-constants
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+
+intermediates := $(local-generated-sources-dir)
+
+HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
+#
+GEN := $(intermediates)/android/hardware/gnss/V1_0/Constants.java
+$(GEN): $(HIDL)
+$(GEN): $(LOCAL_PATH)/types.hal
+$(GEN): $(LOCAL_PATH)/IAGnss.hal
+$(GEN): $(LOCAL_PATH)/IAGnssCallback.hal
+$(GEN): $(LOCAL_PATH)/IAGnssRil.hal
+$(GEN): $(LOCAL_PATH)/IAGnssRilCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnss.hal
+$(GEN): $(LOCAL_PATH)/IGnssBatching.hal
+$(GEN): $(LOCAL_PATH)/IGnssBatchingCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssConfiguration.hal
+$(GEN): $(LOCAL_PATH)/IGnssDebug.hal
+$(GEN): $(LOCAL_PATH)/IGnssGeofenceCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssGeofencing.hal
+$(GEN): $(LOCAL_PATH)/IGnssMeasurement.hal
+$(GEN): $(LOCAL_PATH)/IGnssMeasurementCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssNavigationMessage.hal
+$(GEN): $(LOCAL_PATH)/IGnssNavigationMessageCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssNi.hal
+$(GEN): $(LOCAL_PATH)/IGnssNiCallback.hal
+$(GEN): $(LOCAL_PATH)/IGnssXtra.hal
+$(GEN): $(LOCAL_PATH)/IGnssXtraCallback.hal
+
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
+$(GEN): PRIVATE_CUSTOM_TOOL = \
+ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
+ -Ljava-constants \
+ -randroid.hardware:hardware/interfaces \
+ -randroid.hidl:system/libhidl/transport \
+ android.hardware.gnss@1.0
+
+$(GEN):
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
+# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+
include $(call all-makefiles-under,$(LOCAL_PATH))