Remove LOCAL_MODULE_TAGS
Also renames the modules to all be called gdbserver, with a stem
specified for the 64-bit targets. This allows a single PRODUCT_PACKAGES
entry to work on both 32 & 64 bit devices.
Test: m gdbserver
Test: treehugger; check for proper gdbserver installs on 32 & 64 bit devices
Change-Id: I1c26ce8e271dad4947200f4825a7fa3ef6d4c3c2
diff --git a/android-arm/gdbserver/Android.mk b/android-arm/gdbserver/Android.mk
index dedfa2f..2f0e968 100644
--- a/android-arm/gdbserver/Android.mk
+++ b/android-arm/gdbserver/Android.mk
@@ -7,5 +7,5 @@
LOCAL_SRC_FILES := gdbserver
LOCAL_MODULE := gdbserver
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 32
include $(BUILD_PREBUILT)
diff --git a/android-arm64/gdbserver64/Android.mk b/android-arm64/gdbserver64/Android.mk
index 85008cd..4105038 100644
--- a/android-arm64/gdbserver64/Android.mk
+++ b/android-arm64/gdbserver64/Android.mk
@@ -5,7 +5,8 @@
# get included in user or SDK builds. (GPL issues)
#
LOCAL_SRC_FILES := gdbserver64
-LOCAL_MODULE := gdbserver64
+LOCAL_MODULE := gdbserver
+LOCAL_MODULE_STEM := gdbserver64
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 64
include $(BUILD_PREBUILT)
diff --git a/android-mips/gdbserver/Android.mk b/android-mips/gdbserver/Android.mk
index dedfa2f..2f0e968 100644
--- a/android-mips/gdbserver/Android.mk
+++ b/android-mips/gdbserver/Android.mk
@@ -7,5 +7,5 @@
LOCAL_SRC_FILES := gdbserver
LOCAL_MODULE := gdbserver
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 32
include $(BUILD_PREBUILT)
diff --git a/android-mips64/gdbserver64/Android.mk b/android-mips64/gdbserver64/Android.mk
index 85008cd..4105038 100644
--- a/android-mips64/gdbserver64/Android.mk
+++ b/android-mips64/gdbserver64/Android.mk
@@ -5,7 +5,8 @@
# get included in user or SDK builds. (GPL issues)
#
LOCAL_SRC_FILES := gdbserver64
-LOCAL_MODULE := gdbserver64
+LOCAL_MODULE := gdbserver
+LOCAL_MODULE_STEM := gdbserver64
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 64
include $(BUILD_PREBUILT)
diff --git a/android-x86/gdbserver/Android.mk b/android-x86/gdbserver/Android.mk
index dedfa2f..2f0e968 100644
--- a/android-x86/gdbserver/Android.mk
+++ b/android-x86/gdbserver/Android.mk
@@ -7,5 +7,5 @@
LOCAL_SRC_FILES := gdbserver
LOCAL_MODULE := gdbserver
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 32
include $(BUILD_PREBUILT)
diff --git a/android-x86_64/gdbserver64/Android.mk b/android-x86_64/gdbserver64/Android.mk
index 85008cd..4105038 100644
--- a/android-x86_64/gdbserver64/Android.mk
+++ b/android-x86_64/gdbserver64/Android.mk
@@ -5,7 +5,8 @@
# get included in user or SDK builds. (GPL issues)
#
LOCAL_SRC_FILES := gdbserver64
-LOCAL_MODULE := gdbserver64
+LOCAL_MODULE := gdbserver
+LOCAL_MODULE_STEM := gdbserver64
LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := debug
+LOCAL_MULTILIB := 64
include $(BUILD_PREBUILT)
