Merge 6766a136c32eec4ccc0cb4de878ea971b037994e on remote branch
Change-Id: I4fb9352327ca2866ae023acdb39de3f1a1f6e7b1
diff --git a/Android.mk b/Android.mk
index f2ef2b6..af78f3e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,7 +8,14 @@
LOCAL_MODULE_RELATIVE_PATH := hw
# KEYSTONE(I1132378f14428bf511f3cea4f419e90a6e89f823,b/181709127)
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils android.hardware.power-V1-ndk_platform libbinder_ndk
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libxml2 libbase libutils libbinder_ndk
+
+ifeq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 34), true)
+LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk
+else
+LOCAL_SHARED_LIBRARIES += android.hardware.power-V1-ndk_platform
+endif
+
LOCAL_HEADER_LIBRARIES += libutils_headers
LOCAL_HEADER_LIBRARIES += libhardware_headers
LOCAL_SRC_FILES := power-common.c metadata-parser.c utils.c list.c hint-data.c powerhintparser.c Power.cpp main.cpp
diff --git a/config/anorak/powerhint.xml b/config/anorak/powerhint.xml
index 76ba23c..33c03b2 100644
--- a/config/anorak/powerhint.xml
+++ b/config/anorak/powerhint.xml
@@ -380,10 +380,10 @@
<!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, 1632000 -->
<!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, 2016000 -->
<!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, 2016000 -->
- <Config
- Id="0x00001337" Enable="true" Timeout="0" Target="anorak"
- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X687, 0x40800000, 0X687,
- 0x40804100, 0X660, 0x40800100, 0X660, 0x40800200, 0X8C6, 0x40804200, 0X8C6"/>
+ <!-- <Config -->
+ <!-- Id="0x00001337" Enable="true" Timeout="0" Target="anorak" -->
+ <!-- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X687, 0x40800000, 0X687, -->
+ <!-- 0x40804100, 0X660, 0x40800100, 0X660, 0x40800200, 0X8C6, 0x40804200, 0X8C6"/> -->
<!-- camera close tunings-->
<!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->
@@ -394,10 +394,10 @@
<!-- MPCTLV3_MIN_FREQ_CLUSTER_LITTLE_CORE_0, 1671000 -->
<!-- MPCTLV3_MIN_FREQ_CLUSTER_PLUS_CORE_0, 2016000 -->
<!-- MPCTLV3_MAX_FREQ_CLUSTER_PLUS_CORE_0, 2016000 -->
- <Config
- Id="0x00001338" Enable="true" Timeout="0" Target="anorak"
- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X687, 0x40800000, 0X687,
- 0x40804100, 0X660, 0x40800100, 0X660, 0x40800200, 0X8C6, 0x40804200, 0X8C6"/>
+ <!-- <Config -->
+ <!-- Id="0x00001338" Enable="true" Timeout="0" Target="anorak" -->
+ <!-- Resources="0x40400000, 0x1, 0x40C00000, 0x1, 0x40804000, 0X687, 0x40800000, 0X687, -->
+ <!-- 0x40804100, 0X660, 0x40800100, 0X660, 0x40800200, 0X8C6, 0x40804200, 0X8C6"/> -->
<!-- camera snapshot tunings-->
<!-- MPCTLV3_ALL_CPUS_PWR_CLPS_DIS, 0x1 -->