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

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

Merge "thermal: add hal objects."

parents 20e9679a 254e2fe9

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ subdirs = [ 
    "tests/libhwbinder/1.0",

    "tests/msgq/1.0",

    "tests/pointer/1.0",

    "thermal/1.0",

    "thermal/1.0/default",

    "vehicle/2.0",

    "vibrator/1.0",

    "wifi/1.0",

thermal/1.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.thermal@1.0_genc++",

    tool: "hidl-gen",

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

    srcs: [

        "types.hal",

        "IThermal.hal",

    ],

    out: [

        "android/hardware/thermal/1.0/types.cpp",

        "android/hardware/thermal/1.0/ThermalAll.cpp",

    ],

}



genrule {

    name: "android.hardware.thermal@1.0_genc++_headers",

    tool: "hidl-gen",

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

    srcs: [

        "types.hal",

        "IThermal.hal",

    ],

    out: [

        "android/hardware/thermal/1.0/types.h",

        "android/hardware/thermal/1.0/IThermal.h",

        "android/hardware/thermal/1.0/IHwThermal.h",

        "android/hardware/thermal/1.0/BnThermal.h",

        "android/hardware/thermal/1.0/BpThermal.h",

        "android/hardware/thermal/1.0/BsThermal.h",

    ],

}



cc_library_shared {

    name: "android.hardware.thermal@1.0",

    generated_sources: ["android.hardware.thermal@1.0_genc++"],

    generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],

    export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],

    shared_libs: [

        "libhidl",

        "libhwbinder",

        "libutils",

        "libcutils",

    ],

}

thermal/1.0/Android.mk

0 → 100644
+306 −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.thermal@1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



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



#

# Build types.hal (CoolingDevice)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CoolingDevice.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.thermal@1.0::types.CoolingDevice



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (CoolingType)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CoolingType.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.thermal@1.0::types.CoolingType



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (CpuUsage)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CpuUsage.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.thermal@1.0::types.CpuUsage



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Temperature)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/Temperature.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.thermal@1.0::types.Temperature



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (TemperatureType)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/TemperatureType.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.thermal@1.0::types.TemperatureType



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ThermalStatus)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/ThermalStatus.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.thermal@1.0::types.ThermalStatus



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ThermalStatusCode)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/ThermalStatusCode.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.thermal@1.0::types.ThermalStatusCode



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IThermal.hal

#

GEN := $(intermediates)/android/hardware/thermal/1.0/IThermal.java

$(GEN): $(HIDL)

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

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.thermal@1.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 (CoolingDevice)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CoolingDevice.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.thermal@1.0::types.CoolingDevice



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (CoolingType)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CoolingType.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.thermal@1.0::types.CoolingType



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (CpuUsage)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/CpuUsage.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.thermal@1.0::types.CpuUsage



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Temperature)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/Temperature.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.thermal@1.0::types.Temperature



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (TemperatureType)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/TemperatureType.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.thermal@1.0::types.TemperatureType



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ThermalStatus)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/ThermalStatus.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.thermal@1.0::types.ThermalStatus



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ThermalStatusCode)

#

GEN := $(intermediates)/android/hardware/thermal/1.0/ThermalStatusCode.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.thermal@1.0::types.ThermalStatusCode



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IThermal.hal

#

GEN := $(intermediates)/android/hardware/thermal/1.0/IThermal.java

$(GEN): $(HIDL)

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

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



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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)







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

thermal/1.0/IThermal.hal

0 → 100644
+69 −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.thermal@1.0;



interface IThermal {



    /*

     * Retrieves temperatures in Celsius.

     *

     * @return status Status of the operation. If status code is FAILURE,

     *         the status.debugMessage must be populated with the human-readable

     *         error message.

     * @return temperatures If status code is SUCCESS, it's filled with the

     *         current temperatures. The order of temperatures of built-in

     *         devices (such as CPUs, GPUs and etc.) in the list must be kept

     *         the same regardless the number of calls to this method even if

     *         they go offline, if these devices exist on boot. The method

     *         always returns and never removes such temperatures.

     *

     */

    getTemperatures()

        generates (ThermalStatus status, vec<Temperature> temperatures);



    /*

     * Retrieves CPU usage information of each core: active and total times

     * in ms since first boot.

     *

     * @return status Status of the operation. If status code is FAILURE,

     *         the status.debugMessage must be populated with the human-readable

     *         error message.

     * @return cpuUsages If status code is SUCCESS, it's filled with the current

     *         CPU usages. The order and number of CPUs in the list must be kept

     *         the same regardless the number of calls to this method.

     *

     */

    getCpuUsages() generates (ThermalStatus status, vec<CpuUsage> cpuUsages);



    /*

     * Retrieves the cooling devices information.

     *

     * @return status Status of the operation. If status code is FAILURE,

     *         the status.debugMessage must be populated with the human-readable

     *         error message.

     * @return devices If status code is SUCCESS, it's filled with the current

     *         cooling device information. The order of built-in coolling

     *         devices in the list must be kept the same regardless the number

     *         of calls to this method even if they go offline, if these devices

     *         exist on boot. The method always returns and never removes from

     *         the list such coolling devices.

     *

     */

    getCoolingDevices()

        generates (ThermalStatus status, vec<CoolingDevice> devices);



};

thermal/1.0/default/Android.bp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.thermal@1.0-impl",

    relative_install_path: "hw",

    srcs: ["Thermal.cpp"],

    shared_libs: [

        "liblog",

        "libcutils",

        "libhardware",

        "libhwbinder",

        "libbase",

        "libcutils",

        "libutils",

        "libhidl",

        "android.hardware.thermal@1.0",

    ],

}