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

Commit 058ee272 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "add test for binder inheritance."

parents f43e22b9 cc6ad7df
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ subdirs = [
    "foo/1.0",
    "foo/1.0/default",
    "foo/1.0/default/lib",
    "inheritance/1.0",
    "inheritance/1.0/default",
    "libhwbinder/1.0",
    "libhwbinder/1.0/default",
    "msgq/1.0",
+71 −0
Original line number Diff line number Diff line
// This file is autogenerated by hidl-gen. Do not edit manually.

genrule {
    name: "android.hardware.tests.inheritance@1.0_genc++",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0",
    srcs: [
        "IChild.hal",
        "IFetcher.hal",
        "IGrandparent.hal",
        "IParent.hal",
    ],
    out: [
        "android/hardware/tests/inheritance/1.0/ChildAll.cpp",
        "android/hardware/tests/inheritance/1.0/FetcherAll.cpp",
        "android/hardware/tests/inheritance/1.0/GrandparentAll.cpp",
        "android/hardware/tests/inheritance/1.0/ParentAll.cpp",
    ],
}

genrule {
    name: "android.hardware.tests.inheritance@1.0_genc++_headers",
    tool: "hidl-gen",
    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.tests.inheritance@1.0",
    srcs: [
        "IChild.hal",
        "IFetcher.hal",
        "IGrandparent.hal",
        "IParent.hal",
    ],
    out: [
        "android/hardware/tests/inheritance/1.0/IChild.h",
        "android/hardware/tests/inheritance/1.0/IHwChild.h",
        "android/hardware/tests/inheritance/1.0/BnChild.h",
        "android/hardware/tests/inheritance/1.0/BpChild.h",
        "android/hardware/tests/inheritance/1.0/BsChild.h",
        "android/hardware/tests/inheritance/1.0/IFetcher.h",
        "android/hardware/tests/inheritance/1.0/IHwFetcher.h",
        "android/hardware/tests/inheritance/1.0/BnFetcher.h",
        "android/hardware/tests/inheritance/1.0/BpFetcher.h",
        "android/hardware/tests/inheritance/1.0/BsFetcher.h",
        "android/hardware/tests/inheritance/1.0/IGrandparent.h",
        "android/hardware/tests/inheritance/1.0/IHwGrandparent.h",
        "android/hardware/tests/inheritance/1.0/BnGrandparent.h",
        "android/hardware/tests/inheritance/1.0/BpGrandparent.h",
        "android/hardware/tests/inheritance/1.0/BsGrandparent.h",
        "android/hardware/tests/inheritance/1.0/IParent.h",
        "android/hardware/tests/inheritance/1.0/IHwParent.h",
        "android/hardware/tests/inheritance/1.0/BnParent.h",
        "android/hardware/tests/inheritance/1.0/BpParent.h",
        "android/hardware/tests/inheritance/1.0/BsParent.h",
    ],
}

cc_library_shared {
    name: "android.hardware.tests.inheritance@1.0",
    generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"],
    generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"],
    shared_libs: [
        "libhidl",
        "libhwbinder",
        "libutils",
        "libcutils",
    ],
export_shared_lib_headers: [
    "libhidl",
    "libhwbinder",
    "libutils",
    ],
}
+186 −0
Original line number Diff line number Diff line
# This file is autogenerated by hidl-gen. Do not edit manually.

LOCAL_PATH := $(call my-dir)

################################################################################

include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES

intermediates := $(local-generated-sources-dir)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#
# Build IChild.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IParent.hal
$(GEN): $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IChild

$(GEN): $(LOCAL_PATH)/IChild.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IFetcher.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IChild.hal
$(GEN): $(LOCAL_PATH)/IChild.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IGrandparent.hal
$(GEN): $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IParent.hal
$(GEN): $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IFetcher

$(GEN): $(LOCAL_PATH)/IFetcher.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IGrandparent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IGrandparent

$(GEN): $(LOCAL_PATH)/IGrandparent.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IParent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IGrandparent.hal
$(GEN): $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IParent

$(GEN): $(LOCAL_PATH)/IParent.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_JAVA_LIBRARY)


################################################################################

include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.tests.inheritance@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES

intermediates := $(local-generated-sources-dir)

HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#
# Build IChild.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IParent.hal
$(GEN): $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IChild

$(GEN): $(LOCAL_PATH)/IChild.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IFetcher.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IChild.hal
$(GEN): $(LOCAL_PATH)/IChild.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IGrandparent.hal
$(GEN): $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IParent.hal
$(GEN): $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IFetcher

$(GEN): $(LOCAL_PATH)/IFetcher.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IGrandparent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IGrandparent

$(GEN): $(LOCAL_PATH)/IGrandparent.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IParent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IGrandparent.hal
$(GEN): $(LOCAL_PATH)/IGrandparent.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
        -Ljava -randroid.hardware:hardware/interfaces \
        android.hardware.tests.inheritance@1.0::IParent

$(GEN): $(LOCAL_PATH)/IParent.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_STATIC_JAVA_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))
+22 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 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.inheritance@1.0;
import IParent;

interface IChild extends IParent {
    doChild();
};
+28 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 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.inheritance@1.0;

import IGrandparent;
import IParent;
import IChild;

interface IFetcher {

    getGrandparent(bool sendRemote) generates (IGrandparent parent);
    getParent(bool sendRemote) generates (IParent parent);
    getChild(bool sendRemote) generates (IChild child);
};
Loading