Use PRODUCT_PACKAGES_{ENG,DEBUG}

Instead of using:

  ifdef BRILLO
  LOCAL_MODULE_TAGS := eng
  endif

all over the tree, use PRODUCT_PACKAGES_{ENG,DEBUG} to trigger
installation on eng / userdebug builds. Soong doesn't support module
tags, and it doesn't support most conditionals.

Change-Id: I2b31f54963a2544d26738c421e0f8815e9ba4372

4 files changed, 34 insertions, 21 deletions

diff --git a/brillo_base.mk b/brillo_base.mk
index 55f287b..1699423 100644
--- a/brillo_base.mk
+++ b/brillo_base.mk
@@ -70,7 +70,7 @@ WITHOUT_CHECK_API := true
 # dependencies on the framework.
 ANDROID_NO_TEST_CHECK := true
 
-PRODUCT_PACKAGES = \
+PRODUCT_PACKAGES := \
   adbd \
   bootctl \
   firewalld \
@@ -109,19 +109,46 @@ PRODUCT_PACKAGES = \
 PRODUCT_PACKAGES += \
   libstdc++ \
 
-ifneq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug))
 # Packages included only for eng or userdebug builds.
-PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES_DEBUG += \
   dumpsys \
   webservd_test_client
-endif
 
-ifneq ($(TARGET_BUILD_VARIANT),eng)
 # eng builds don't include the official payload key so developers can test
 # providing their own testing key.
-PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES_ENG += \
   brillo-update-payload-key
-endif
+
+# Packages for eng and userdebug images
+PRODUCT_PACKAGES_DEBUG += \
+  webservd_testc
+
+# Packages for eng images
+PRODUCT_PACKAGES_ENG += \
+  apmanager_test \
+  audio_hal_playback_test \
+  audio_hal_record_test \
+  brillo_audio_test \
+  brillo_camera_client \
+  crash_reporter_tests \
+  firewalld_unittest \
+  libbrillo_test \
+  libchrome_test \
+  libminijail_test \
+  libminijail_unittest \
+  libnativepower_tests \
+  libperipheralman_tests \
+  metrics_collector_tests \
+  metricsd_tests \
+  nativepowerman_tests \
+  seccomp_bpf_test \
+  sensors-hal-example-app \
+  sensors-ndk-example-app \
+  shill_setup_wifi \
+  shill_test \
+  syscall_filter_unittest \
+  update_engine_unittests \
+  weaved_test \
 
 # SELinux packages.
 PRODUCT_PACKAGES += \
diff --git a/pts/audio/brillo-audio-test/Android.mk b/pts/audio/brillo-audio-test/Android.mk
index 273c77f..4c55512 100644
--- a/pts/audio/brillo-audio-test/Android.mk
+++ b/pts/audio/brillo-audio-test/Android.mk
@@ -18,9 +18,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := brillo_audio_test
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_SRC_FILES := \
   brillo_audio_test.cpp \
   libmedia_playback.cpp \
diff --git a/pts/audio/hal-test/Android.mk b/pts/audio/hal-test/Android.mk
index a37314f..ee7050e 100644
--- a/pts/audio/hal-test/Android.mk
+++ b/pts/audio/hal-test/Android.mk
@@ -21,9 +21,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := audio_hal_playback_test.cpp
 LOCAL_MODULE := audio_hal_playback_test
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_CFLAGS += -Wall -Werror
 LOCAL_SHARED_LIBRARIES := \
   libaudioutils \
@@ -45,9 +42,6 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := audio_hal_record_test.cpp
 LOCAL_MODULE := audio_hal_record_test
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
 LOCAL_CFLAGS += -Wall -Werror -Wno-sign-compare
 LOCAL_SHARED_LIBRARIES := \
   libaudioutils \
diff --git a/pts/seccomp/Android.mk b/pts/seccomp/Android.mk
index d0e634e..1f62940 100644
--- a/pts/seccomp/Android.mk
+++ b/pts/seccomp/Android.mk
@@ -25,11 +25,6 @@ LOCAL_CFLAGS += \
 	-Wno-missing-field-initializers \
 	-Wno-empty-body
 
-# Include this in Brillo -eng builds only (for automated testing).
-ifdef BRILLO
-LOCAL_MODULE_TAGS := eng
-endif
-
 LOCAL_SRC_FILES := seccomp_bpf.c
 
 include $(BUILD_NATIVE_TEST)