commit 1e2bd45f3f12348c6a68e62d5f6ec738c8c90697
author Amit Mahajan <amitmahajan@google.com> Wed Jul 12 10:17:36 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Aug 03 15:20:29 2017 -0700
tree 7cea9266071a3a810477998a4e89783e2354a88b
parent e2cc4c4f80934fac9563d663f0ec1822678e61cc

Add an empty 1.1 ISap interface.

This is needed since manifest doesn't support different versions
for different interfaces in a package. Since there's a 1.1 for
IRadio, there needs to be a 1.1 for ISap as well.

Test: build
Bug: 63598469
Bug: 62371412
Change-Id: I7537b0074f772fab4a26d4ed97d346610784eeac
Merged-In: I9a0bd898e5d236f05d6574b3e3093521d0f57d52

radio/1.1/Android.mk

diff --git a/radio/1.1/Android.mk b/radio/1.1/Android.mk
index a26fd52..74ce516 100644
--- a/radio/1.1/Android.mk
+++ b/radio/1.1/Android.mk
@@ -366,6 +366,25 @@
 $(GEN): $(LOCAL_PATH)/IRadioResponse.hal
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISap.hal
+#
+GEN := $(intermediates)/android/hardware/radio/V1_1/ISap.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.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.radio@1.1::ISap
+
+$(GEN): $(LOCAL_PATH)/ISap.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_JAVA_LIBRARY)
 
 
@@ -733,6 +752,25 @@
 $(GEN): $(LOCAL_PATH)/IRadioResponse.hal
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
+
+#
+# Build ISap.hal
+#
+GEN := $(intermediates)/android/hardware/radio/V1_1/ISap.java
+$(GEN): $(HIDL)
+$(GEN): PRIVATE_HIDL := $(HIDL)
+$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.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.radio@1.1::ISap
+
+$(GEN): $(LOCAL_PATH)/ISap.hal
+	$(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_STATIC_JAVA_LIBRARY)