diff --git a/Android.mk b/Android.mk index 5493cb3..c92cde7 100644 --- a/Android.mk +++ b/Android.mk @@ -73,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 @@ -87,13 +81,6 @@ 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 @@ -102,6 +89,3 @@ LOCAL_VENDOR_MODULE := true LOCAL_VINTF_FRAGMENTS := power.xml include $(BUILD_EXECUTABLE) endif - - -endif 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