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

Commit 21a1c58b authored by Steven Moreland's avatar Steven Moreland
Browse files

Move example extensions to test folder. 

Fixes: 34969978
Test: hal registers itself and works.

Change-Id: I9e4795b1acbabceed017c469b89baea7e529308a
parent 0b77fdaa

example/Android.bp

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "extension/light/2.0",

]

example/extension/light/2.0/default/android.hardware.example.extension.light@2.0-service.rc

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
service light-ext-2-0 /vendor/bin/hw/android.hardware.example.extension.light@2.0-service

    class hal

    user system

    group system readproc
 
 No newline at end of file

tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ subdirs = [ 
    "bar/1.0/default",

    "baz/1.0",

    "expression/1.0",

    "extension/light/2.0",

    "foo/1.0",

    "foo/1.0/default",

    "foo/1.0/default/lib",

example/extension/light/2.0/Android.bp→tests/extension/light/2.0/Android.bp

+62 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen. Do not edit manually.



filegroup {

    name: "android.hardware.example.extension.light@2.0_hal",

    name: "android.hardware.tests.extension.light@2.0_hal",

    srcs: [

        "types.hal",

        "IExtLight.hal",
@@ -9,40 +9,40 @@ filegroup { 
}



genrule {

    name: "android.hardware.example.extension.light@2.0_genc++",

    name: "android.hardware.tests.extension.light@2.0_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.example.extension.light@2.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",

    srcs: [

        ":android.hardware.example.extension.light@2.0_hal",

        ":android.hardware.tests.extension.light@2.0_hal",

    ],

    out: [

        "android/hardware/example/extension/light/2.0/types.cpp",

        "android/hardware/example/extension/light/2.0/ExtLightAll.cpp",

        "android/hardware/tests/extension/light/2.0/types.cpp",

        "android/hardware/tests/extension/light/2.0/ExtLightAll.cpp",

    ],

}



genrule {

    name: "android.hardware.example.extension.light@2.0_genc++_headers",

    name: "android.hardware.tests.extension.light@2.0_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.example.extension.light@2.0",

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.extension.light@2.0",

    srcs: [

        ":android.hardware.example.extension.light@2.0_hal",

        ":android.hardware.tests.extension.light@2.0_hal",

    ],

    out: [

        "android/hardware/example/extension/light/2.0/types.h",

        "android/hardware/example/extension/light/2.0/IExtLight.h",

        "android/hardware/example/extension/light/2.0/IHwExtLight.h",

        "android/hardware/example/extension/light/2.0/BnHwExtLight.h",

        "android/hardware/example/extension/light/2.0/BpHwExtLight.h",

        "android/hardware/example/extension/light/2.0/BsExtLight.h",

        "android/hardware/tests/extension/light/2.0/types.h",

        "android/hardware/tests/extension/light/2.0/IExtLight.h",

        "android/hardware/tests/extension/light/2.0/IHwExtLight.h",

        "android/hardware/tests/extension/light/2.0/BnHwExtLight.h",

        "android/hardware/tests/extension/light/2.0/BpHwExtLight.h",

        "android/hardware/tests/extension/light/2.0/BsExtLight.h",

    ],

}



cc_library_shared {

    name: "android.hardware.example.extension.light@2.0",

    generated_sources: ["android.hardware.example.extension.light@2.0_genc++"],

    generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.example.extension.light@2.0_genc++_headers"],

    name: "android.hardware.tests.extension.light@2.0",

    generated_sources: ["android.hardware.tests.extension.light@2.0_genc++"],

    generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],

    export_generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

example/extension/light/2.0/Android.mk→tests/extension/light/2.0/Android.mk

+18 −18
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.example.extension.light@2.0-java

LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -20,7 +20,7 @@ LOCAL_JAVA_LIBRARIES := \ 
#

# Build types.hal (Default)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/Default.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/Default.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -30,7 +30,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.Default

        android.hardware.tests.extension.light@2.0::types.Default



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

	$(transform-generated-source)
@@ -39,7 +39,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (ExtBrightness)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtBrightness.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtBrightness.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -49,7 +49,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.ExtBrightness

        android.hardware.tests.extension.light@2.0::types.ExtBrightness



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

	$(transform-generated-source)
@@ -58,7 +58,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (ExtLightState)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtLightState.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtLightState.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -68,7 +68,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.ExtLightState

        android.hardware.tests.extension.light@2.0::types.ExtLightState



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

	$(transform-generated-source)
@@ -77,7 +77,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IExtLight.hal

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/IExtLight.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/IExtLight.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExtLight.hal
@@ -89,7 +89,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::IExtLight

        android.hardware.tests.extension.light@2.0::IExtLight



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

	$(transform-generated-source)
@@ -100,7 +100,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.example.extension.light@2.0-java-static

LOCAL_MODULE := android.hardware.tests.extension.light@2.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -115,7 +115,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
#

# Build types.hal (Default)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/Default.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/Default.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -125,7 +125,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.Default

        android.hardware.tests.extension.light@2.0::types.Default



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

	$(transform-generated-source)
@@ -134,7 +134,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (ExtBrightness)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtBrightness.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtBrightness.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -144,7 +144,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.ExtBrightness

        android.hardware.tests.extension.light@2.0::types.ExtBrightness



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

	$(transform-generated-source)
@@ -153,7 +153,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (ExtLightState)

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/ExtLightState.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/ExtLightState.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -163,7 +163,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::types.ExtLightState

        android.hardware.tests.extension.light@2.0::types.ExtLightState



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

	$(transform-generated-source)
@@ -172,7 +172,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IExtLight.hal

#

GEN := $(intermediates)/android/hardware/example/extension/light/V2_0/IExtLight.java

GEN := $(intermediates)/android/hardware/tests/extension/light/V2_0/IExtLight.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExtLight.hal
@@ -184,7 +184,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ 
        -Ljava \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.example.extension.light@2.0::IExtLight

        android.hardware.tests.extension.light@2.0::IExtLight



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

	$(transform-generated-source)