commit d4bf4a74841872c41b4284a9a6673d1ff6657240
author Dan Willemsen <dwillemsen@google.com> Tue Aug 02 20:51:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 02 20:51:37 2016 +0000
tree 46b314ecf0d70840e966516c865d87b6435835d4
parent 70d55adbe30ccab9ce54ee782aa80724ad27862b
parent 1c5af31e030364930a5387ae3dc57e348070c184

Remove Brillo-specific LOCAL_MODULE_TAGS am: 7d8fd7e16b am: 9e5dc07bb2
am: 1c5af31e03

Change-Id: Id9529a7fec1243c3a115a411242d74530e65693e

client/Android.mk

diff --git a/client/Android.mk b/client/Android.mk
index 7bdfbb4..af2f50f 100644
--- a/client/Android.mk
+++ b/client/Android.mk
@@ -48,9 +48,6 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libnativepower_tests
-ifdef BRILLO
-  LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS := $(libnativepower_CommonCFlags)
 LOCAL_C_INCLUDES := $(libnativepower_CommonCIncludes)

daemon/Android.mk

diff --git a/daemon/Android.mk b/daemon/Android.mk
index 17f8045..4a97794 100644
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -91,9 +91,6 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := nativepowerman_tests
-ifdef BRILLO
-  LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CFLAGS := $(nativepowerman_CommonCFlags)
 LOCAL_STATIC_LIBRARIES := libnativepowerman libgtest libBionicGtestMain