Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e2bd45f authored by Amit Mahajan's avatar Amit Mahajan Committed by Steven Moreland
Browse files

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
parent e2cc4c4f

radio/1.1/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ filegroup { 
        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",

        "ISap.hal",

    ],

}
@@ -22,6 +23,7 @@ genrule { 
        "android/hardware/radio/1.1/RadioAll.cpp",

        "android/hardware/radio/1.1/RadioIndicationAll.cpp",

        "android/hardware/radio/1.1/RadioResponseAll.cpp",

        "android/hardware/radio/1.1/SapAll.cpp",

    ],

}
@@ -50,6 +52,11 @@ genrule { 
        "android/hardware/radio/1.1/BnHwRadioResponse.h",

        "android/hardware/radio/1.1/BpHwRadioResponse.h",

        "android/hardware/radio/1.1/BsRadioResponse.h",

        "android/hardware/radio/1.1/ISap.h",

        "android/hardware/radio/1.1/IHwSap.h",

        "android/hardware/radio/1.1/BnHwSap.h",

        "android/hardware/radio/1.1/BpHwSap.h",

        "android/hardware/radio/1.1/BsSap.h",

    ],

}

radio/1.1/Android.mk

+38 −0
Original line number Diff line number Diff line
@@ -366,6 +366,25 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
$(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): PRIVATE_CUSTOM_TOOL = \ 
$(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)

radio/1.1/ISap.hal

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.radio@1.1;



import @1.0::ISap;



interface ISap extends @1.0::ISap {

    /**

     * Empty top level interface.

     */

};