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

Commit 7ff7da90 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'hidl-light-hal' 

* changes:
  Adding android.hardware.light@2.0 service.
  Light 2.0 hal default implementation.
  Add lights 2.0 hal.
parents d2586811 41db6ab8

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ subdirs = [ 
    "benchmarks/msgq/1.0",

    "memtrack/1.0",

    "memtrack/1.0/default",

    "light/2.0",

    "nfc/1.0",

    "nfc/1.0/default",

    "radio/1.0",

light/2.0/Android.bp

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



genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",

    srcs: [

        "types.hal",

        "ILight.hal",

    ],

    out: [

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

        "android/hardware/light/2.0/LightAll.cpp",

    ],

}



genrule {

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

    tool: "hidl-gen",

    cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.light@2.0",

    srcs: [

        "types.hal",

        "ILight.hal",

    ],

    out: [

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

        "android/hardware/light/2.0/ILight.h",

        "android/hardware/light/2.0/IHwLight.h",

        "android/hardware/light/2.0/BnLight.h",

        "android/hardware/light/2.0/BpLight.h",

        "android/hardware/light/2.0/BsLight.h",

    ],

}



cc_library_shared {

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

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

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

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

    shared_libs: [

        "libhidl",

        "libhwbinder",

        "libutils",

        "libcutils",

    ],

}

light/2.0/Android.mk

0 → 100644
+238 −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.light@2.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build types.hal (Brightness)

#

GEN := $(intermediates)/android/hardware/light/2.0/Brightness.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Brightness



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Flash)

#

GEN := $(intermediates)/android/hardware/light/2.0/Flash.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Flash



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (LightState)

#

GEN := $(intermediates)/android/hardware/light/2.0/LightState.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.LightState



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Status)

#

GEN := $(intermediates)/android/hardware/light/2.0/Status.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Status



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Type)

#

GEN := $(intermediates)/android/hardware/light/2.0/Type.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Type



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ILight.hal

#

GEN := $(intermediates)/android/hardware/light/2.0/ILight.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::ILight



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

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

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build types.hal (Brightness)

#

GEN := $(intermediates)/android/hardware/light/2.0/Brightness.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Brightness



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Flash)

#

GEN := $(intermediates)/android/hardware/light/2.0/Flash.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Flash



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (LightState)

#

GEN := $(intermediates)/android/hardware/light/2.0/LightState.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.LightState



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Status)

#

GEN := $(intermediates)/android/hardware/light/2.0/Status.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Status



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Type)

#

GEN := $(intermediates)/android/hardware/light/2.0/Type.java

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::types.Type



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ILight.hal

#

GEN := $(intermediates)/android/hardware/light/2.0/ILight.java

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILight.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal

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

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava -randroid.hardware:hardware/interfaces \

        android.hardware.light@2.0::ILight



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

light/2.0/ILight.hal

0 → 100644
+37 −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.light@2.0;



interface ILight {



    /**

     * Set the provided lights to the provided values.

     *

     * @param type logical light to set

     * @param state describes what the light should look like.

     * @return status result of applying state transformation.

     */

    setLight(Type type, LightState state) generates (Status status);



    /**

     * Discover what indicator lights are available.

     *

     * @return types list of available lights

     */

    getSupportedTypes() generates (vec<Type> types);



};

light/2.0/default/Android.mk

0 → 100644
+43 −0
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.light@2.0-impl

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_SRC_FILES := \

    Light.cpp \



LOCAL_SHARED_LIBRARIES := \

    libhidl \

    libhwbinder \

    libutils \

    liblog \

    libcutils \

    libhardware \

    libbase \

    libcutils \

    android.hardware.light@2.0 \



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_MODULE := android.hardware.light@2.0-service

LOCAL_INIT_RC := android.hardware.light@2.0-service.rc

LOCAL_SRC_FILES := \

    service.cpp \



LOCAL_SHARED_LIBRARIES := \

    liblog \

    libcutils \

    libdl \

    libbase \

    libutils \

    libhardware_legacy \

    libhardware \



LOCAL_SHARED_LIBRARIES += \

    libhwbinder \

    libhidl \

    android.hardware.light@2.0 \



include $(BUILD_EXECUTABLE)