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

Commit 79a99578 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Add an empty 1.1 ISap interface." into oc-dr1-dev 

am: 48d56695

Change-Id: Ia615da9856af21d45fd10c175bbb3a357b7378bd
parents fd443f8e 48d56695

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ e02cd3722cb5e8fa51179f5defacb4f7866f903c9c7c51dc01a3148473a71525 android.hardwar 
f79edf50a378a9c9bb737f93f205dab91b4c63ea49723afc6f856c138203ea81 android.hardware.radio@1.1::IRadio

fcc5c8c88b85a9f63fba67d9e674da466c72a98ca287f343fb5721d098713f86 android.hardware.radio@1.1::IRadioIndication

50f27e8c7ec009d5d4418b2ce8392b940bbf052ecc1d7251285f332485a5ba4e android.hardware.radio@1.1::IRadioResponse

be981148c95c0089f3ae92854f0e7ae999d308e927db3e065f12a4fabe07852f android.hardware.radio@1.1::ISap

d8d6bf7b4d36c04ce587df75953c3f723cfbe71c896c1aa8ab6478eae126723d android.hardware.radio@1.1::types

d8aae01606bfd34bf2fb9a59cadc016f46f318e56cddb8f15a945c5b3c1222bc android.hardware.tetheroffload.config@1.0::IOffloadConfig

447b00306bc95a7aafec1d660f6f3e9f76ac8bc0353193435e5579ab833da619 android.hardware.tetheroffload.control@1.0::IOffloadControl

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
@@ -364,6 +364,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)
@@ -729,6 +748,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.

     */

};