commit 91fe4ae6650705f9421cbf17ff0e3410908d2eeb
author android-build-team Robot <android-build-team-robot@google.com> Tue Jan 30 08:21:42 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jan 30 08:21:42 2018 +0000
tree 5b348f12bf8c6c88bfb445bdc041daeddfad5be2
parent 82208751b4f1b9d22b42e7385591411c003b9d06
parent bab255a23842e28c1c457260e9799c2a07eab8ef

Snap for 4574286 from bab255a23842e28c1c457260e9799c2a07eab8ef to pi-release

Change-Id: I88ac99d20021fd8db781505221851b921a1ab6a9

Android.mk

diff --git a/Android.mk b/Android.mk
index ddf633d..aa9fb6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -772,7 +772,6 @@
     $(eval include $(CLEAR_VARS)) \
     $(eval LOCAL_MODULE := ue_$(1).pem) \
     $(eval LOCAL_MODULE_CLASS := ETC) \
-    $(eval $(ifeq $(BRILLO), 1, LOCAL_MODULE_TAGS := eng)) \
     $(eval LOCAL_SRC_FILES := $(1).pem) \
     $(eval LOCAL_MODULE_PATH := \
         $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests) \
@@ -782,7 +781,6 @@
     $(eval include $(CLEAR_VARS)) \
     $(eval LOCAL_MODULE := ue_$(1).pub.pem) \
     $(eval LOCAL_MODULE_CLASS := ETC) \
-    $(eval $(ifeq $(BRILLO), 1, LOCAL_MODULE_TAGS := eng)) \
     $(eval LOCAL_MODULE_PATH := \
         $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests) \
     $(eval LOCAL_MODULE_STEM := $(1).pub.pem) \
@@ -804,7 +802,6 @@
     $(eval include $(CLEAR_VARS)) \
     $(eval LOCAL_MODULE := ue_unittest_$(1)) \
     $(eval LOCAL_MODULE_CLASS := EXECUTABLES) \
-    $(eval $(ifeq $(BRILLO), 1, LOCAL_MODULE_TAGS := eng)) \
     $(eval LOCAL_MODULE_PATH := \
         $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests/gen) \
     $(eval LOCAL_MODULE_STEM := $(1)) \