diff --git a/Android.mk b/Android.mk index 7e3c79b..c92cde7 100644 --- a/Android.mk +++ b/Android.mk @@ -8,16 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw # KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127) -LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils libbinder_ndk - -ifeq ($(call math_gt_or_eq, 33, $(PLATFORM_SDK_VERSION)), true) - LOCAL_SHARED_LIBRARIES += android.hardware.power-V3-ndk -endif -ifeq ($(call math_gt_or_eq, 34, $(PLATFORM_SDK_VERSION)), true) - LOCAL_SHARED_LIBRARIES += android.hardware.power-V4-ndk -else - LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform -endif +LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils libbinder_ndk android.hardware.power-V3-ndk LOCAL_HEADER_LIBRARIES += libutils_headers LOCAL_HEADER_LIBRARIES += libhardware_headers @@ -82,12 +73,6 @@ ifeq ($(call is-board-platform-in-list,qcs605), true) LOCAL_SRC_FILES += power-710.c endif -ifeq ($(call is-board-platform-in-list,trinket), true) -LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 -LOCAL_SRC_FILES := power.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c -LOCAL_SRC_FILES += power-6125.c -endif - ifeq ($(call is-board-platform-in-list,msmnile), true) LOCAL_SRC_FILES += power-msmnile.c endif @@ -96,25 +81,11 @@ ifeq ($(TARGET_USES_INTERACTION_BOOST),true) LOCAL_CFLAGS += -DINTERACTION_BOOST endif -ifeq ($(call is-board-platform-in-list,trinket), true) -LOCAL_MODULE := power.qcom -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable -LOCAL_VENDOR_MODULE := true -include $(BUILD_SHARED_LIBRARY) -else LOCAL_MODULE := android.hardware.power-service LOCAL_INIT_RC := android.hardware.power-service.rc LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-variable LOCAL_VENDOR_MODULE := true -ifeq ($(PLATFORM_SDK_VERSION), 34) -LOCAL_VINTF_FRAGMENTS := /vintf/sdk34/power.xml -else LOCAL_VINTF_FRAGMENTS := power.xml -endif include $(BUILD_EXECUTABLE) endif - - -endif diff --git a/PowerHintSession.cpp b/PowerHintSession.cpp index c4e9074..c466947 100644 --- a/PowerHintSession.cpp +++ b/PowerHintSession.cpp @@ -31,15 +31,3 @@ ndk::ScopedAStatus PowerHintSessionImpl::resume(){ ndk::ScopedAStatus PowerHintSessionImpl::close(){ return ndk::ScopedAStatus::ok(); } -#if (PLATFORM_SDK_VERSION >= 34) -ndk::ScopedAStatus PowerHintSessionImpl::sendHint(aidl::android::hardware::power::SessionHint hint){ - return ndk::ScopedAStatus::ok(); -} -ndk::ScopedAStatus PowerHintSessionImpl::setThreads(const std::vector& threadIds){ - if (threadIds.size() == 0) { - LOG(ERROR) << "Error: threadIds.size() shouldn't be " << threadIds.size(); - return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT); - } - return ndk::ScopedAStatus::ok(); -} -#endif diff --git a/PowerHintSession.h b/PowerHintSession.h index a56713a..3491b26 100644 --- a/PowerHintSession.h +++ b/PowerHintSession.h @@ -8,9 +8,6 @@ #include #include -#if (PLATFORM_SDK_VERSION >= 34) -#include -#endif std::shared_ptr setPowerHintSession(); int64_t getSessionPreferredRate(); @@ -23,9 +20,5 @@ public: ndk::ScopedAStatus pause() override; ndk::ScopedAStatus resume() override; ndk::ScopedAStatus close() override; - #if (PLATFORM_SDK_VERSION >= 34) - ndk::ScopedAStatus sendHint(aidl::android::hardware::power::SessionHint hint) override; - ndk::ScopedAStatus setThreads(const std::vector& threadIds) override; - #endif }; -#endif /* __POWERHINTSESSION__ */ \ No newline at end of file +#endif /* __POWERHINTSESSION__ */ diff --git a/config/trinket/powerhint.xml b/config/trinket/powerhint.xml new file mode 100644 index 0000000..a669dd9 --- /dev/null +++ b/config/trinket/powerhint.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/power-vendor-board.mk b/power-vendor-board.mk index 17ad8b9..23d97aa 100644 --- a/power-vendor-board.mk +++ b/power-vendor-board.mk @@ -1,5 +1 @@ -ifeq ($(TARGET_BOARD_PLATFORM),trinket) -TARGET_USES_NON_LEGACY_POWERHAL := false -else TARGET_USES_NON_LEGACY_POWERHAL := true -endif diff --git a/power-vendor-product.mk b/power-vendor-product.mk index 68d5801..438584f 100644 --- a/power-vendor-product.mk +++ b/power-vendor-product.mk @@ -23,4 +23,6 @@ else ifeq ($(TARGET_BOARD_PLATFORM),pineapple) PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/pineapple/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml else ifeq ($(TARGET_BOARD_PLATFORM),crow) PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/crow/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml +else ifeq ($(TARGET_BOARD_PLATFORM),trinket) +PRODUCT_COPY_FILES += vendor/qcom/opensource/power/config/trinket/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml endif diff --git a/vintf/sdk34/power.xml b/vintf/sdk34/power.xml deleted file mode 100644 index 1e08685..0000000 --- a/vintf/sdk34/power.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - android.hardware.power - 4 - IPower/default - - \ No newline at end of file