commit 0e0fbdd1fcef71e653ad2d988649f6259b304fc2
author Elliott Hughes <enh@google.com> Sat Jan 24 05:33:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jan 24 05:33:56 2015 +0000
tree 5f44230204792c6b9d6d06522eb5643b6ba4414b
parent 7e3fc71ee2eb31fe40f278ce17f72090a9b13620
parent 492dd1e5c1c47bc8a804b58bed941c8eaa94d9a3

am 492dd1e5: Merge "Remove obsolete BUILD_TINY_ANDROID check from healthd makefile"

* commit '492dd1e5c1c47bc8a804b58bed941c8eaa94d9a3':
  Remove obsolete BUILD_TINY_ANDROID check from healthd makefile

healthd/Android.mk

diff --git a/healthd/Android.mk b/healthd/Android.mk
index 1d238b1..07e1d73 100644
--- a/healthd/Android.mk
+++ b/healthd/Android.mk
@@ -1,7 +1,5 @@
 # Copyright 2013 The Android Open Source Project
 
-ifneq ($(BUILD_TINY_ANDROID),true)
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -77,5 +75,3 @@
 
 _add-charger-image :=
 _img_modules :=
-
-endif