commit 9ed8a4efcd9eccfce9fa8e655a12025ddbd5338f
author Dan Willemsen <dwillemsen@google.com> Tue Aug 02 20:46:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 02 20:46:16 2016 +0000
tree 58669186f134845e3fe8bff507e027e837274763
parent de12c2056ef6c421f30da02da87f483d18733462
parent cb04dcf7c3b8e507d4146034971569526da8d703

Remove Brillo-specific LOCAL_MODULE_TAGS am: 41a31017fd
am: cb04dcf7c3

Change-Id: I4ae024a0a9589cd467f9368efe233d9983c1f93d

Android.mk

diff --git a/Android.mk b/Android.mk
index 10335e4..b637b2d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -843,9 +843,6 @@
 # Test HTTP Server.
 include $(CLEAR_VARS)
 LOCAL_MODULE := test_http_server
-ifdef BRILLO
-  LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_CPP_EXTENSION := .cc
@@ -887,9 +884,6 @@
 # Test helper subprocess program.
 include $(CLEAR_VARS)
 LOCAL_MODULE := test_subprocess
-ifdef BRILLO
-  LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_CPP_EXTENSION := .cc
@@ -907,9 +901,6 @@
 # Main unittest file.
 include $(CLEAR_VARS)
 LOCAL_MODULE := update_engine_unittests
-ifdef BRILLO
-  LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_REQUIRED_MODULES := \
     test_http_server \
     test_subprocess \