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

Commit 931ca542 authored by Andreas Huber's avatar Andreas Huber Committed by Gerrit Code Review
Browse files

Merge "Empty interface IQuux which is completely unrelated to IBase and IBaz."

parents 792ec065 84108714

tests/baz/1.0/Android.bp

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

        "IBase.hal",

        "IBaz.hal",

        "IBaz.hal",

        "IBazCallback.hal",

        "IBazCallback.hal",

        "IQuux.hal",

    ],

    ],

}

}
@@ -22,6 +23,7 @@ genrule { 
        "android/hardware/tests/baz/1.0/BaseAll.cpp",

        "android/hardware/tests/baz/1.0/BaseAll.cpp",

        "android/hardware/tests/baz/1.0/BazAll.cpp",

        "android/hardware/tests/baz/1.0/BazAll.cpp",

        "android/hardware/tests/baz/1.0/BazCallbackAll.cpp",

        "android/hardware/tests/baz/1.0/BazCallbackAll.cpp",

        "android/hardware/tests/baz/1.0/QuuxAll.cpp",

    ],

    ],

}

}
@@ -50,6 +52,11 @@ genrule { 
        "android/hardware/tests/baz/1.0/BnHwBazCallback.h",

        "android/hardware/tests/baz/1.0/BnHwBazCallback.h",

        "android/hardware/tests/baz/1.0/BpHwBazCallback.h",

        "android/hardware/tests/baz/1.0/BpHwBazCallback.h",

        "android/hardware/tests/baz/1.0/BsBazCallback.h",

        "android/hardware/tests/baz/1.0/BsBazCallback.h",

        "android/hardware/tests/baz/1.0/IQuux.h",

        "android/hardware/tests/baz/1.0/IHwQuux.h",

        "android/hardware/tests/baz/1.0/BnHwQuux.h",

        "android/hardware/tests/baz/1.0/BpHwQuux.h",

        "android/hardware/tests/baz/1.0/BsQuux.h",

    ],

    ],

}

}

tests/baz/1.0/Android.mk

+38 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,25 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
$(GEN): $(LOCAL_PATH)/IBazCallback.hal

$(GEN): $(LOCAL_PATH)/IBazCallback.hal

	$(transform-generated-source)

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IQuux.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IQuux.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IQuux.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.tests.baz@1.0::IQuux



$(GEN): $(LOCAL_PATH)/IQuux.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)

include $(BUILD_JAVA_LIBRARY)
@@ -153,6 +172,25 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
$(GEN): $(LOCAL_PATH)/IBazCallback.hal

$(GEN): $(LOCAL_PATH)/IBazCallback.hal

	$(transform-generated-source)

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IQuux.hal

#

GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IQuux.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IQuux.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.tests.baz@1.0::IQuux



$(GEN): $(LOCAL_PATH)/IQuux.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)

include $(BUILD_STATIC_JAVA_LIBRARY)

tests/baz/1.0/IQuux.hal

0 → 100644
+20 −0
Original line number Original line 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.tests.baz@1.0;



interface IQuux {

};