commit e226af2a0b4bc3cb632cb139c9cdfb65a5634100
author Connor O'Brien <connoro@google.com> Wed Feb 22 12:59:11 2017 -0800
committer Connor O'Brien <connoro@google.com> Wed Feb 22 13:34:34 2017 -0800
tree 0b43026ae04d3d05181261f5615a269902ba7e96
parent 2071727e9f24d445676907b55b3021d6832097c7

Use power.marlin for all marlin/sailfish builds

Bug: 35634271
Test: Builds and boots successfully
Change-Id: Ied990f59cc787a84b5d0670516e6f98a1f9cad10
Signed-off-by: Connor O'Brien <connoro@google.com>

common/base.mk

diff --git a/common/base.mk b/common/base.mk
index 98b2da3..9529394 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -477,7 +477,7 @@
 LIBQDMETADATA := libqdMetaData
 
 #LIBPOWER
-LIBPOWER := power.$(patsubst %f,%,$(subst _eas,,$(subst aosp_,,$(TARGET_PRODUCT))))
+LIBPOWER := power.marlin
 LIBPOWER += android.hardware.power@1.0-impl
 
 #LLVM for RenderScript

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 69ac3cc..d97f1f4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -126,6 +126,8 @@
     android.hardware.vibrator@1.0-service \
     android.hardware.vr@1.0-service \
 
+PRODUCT_PROPERTY_OVERRIDES += ro.hardware.power=marlin
+
 # Light HAL
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-impl

power/Android.mk

diff --git a/power/Android.mk b/power/Android.mk
index 7e96cfe..889bc9a 100644
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_CFLAGS += -Wno-unused-parameter
 
-LOCAL_MODULE := power.$(patsubst %f,%,$(subst _eas,,$(subst aosp_,,$(TARGET_PRODUCT))))
+LOCAL_MODULE := power.marlin
 LOCAL_MODULE_TAGS := optional
 include $(BUILD_SHARED_LIBRARY)