aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSriram Raman <sriramkraman@google.com>2009-05-29 14:06:39 -0700
committerSriram Raman <sriramkraman@google.com>2009-05-29 14:06:39 -0700
commitf56e06a2344baba76763782d8359323eae789d29 (patch)
treeff24c4cfbdce03bfcb4c51893a03f129f57c6953
parentcabb5dd768714a7df34469a096b5e1aa815a2c22 (diff)
downloadquake-f56e06a2344baba76763782d8359323eae789d29.tar.gz
Don't build quake or libquake with tests builds
-rw-r--r--Android.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index f0760ab..3990f26 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,7 @@
+#########################################################################
# Quake game
# This makefile builds both an activity and a shared library.
-
+#########################################################################
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
TOP_LOCAL_PATH:= $(call my-dir)
@@ -20,16 +21,16 @@ LOCAL_JNI_SHARED_LIBRARIES := libquake
include $(BUILD_PACKAGE)
+#########################################################################
# Build Quake Shared Library
+#########################################################################
LOCAL_PATH:= $(LOCAL_PATH)/quake/src/WinQuake
include $(CLEAR_VARS)
-# This isn't a test, but giving it a tests tag
-# means that this apk won't be installed by
-# default in any configuration.
-LOCAL_MODULE_TAGS := tests
+# Optional tag would mean it doesn't get installed by default
+LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Werror
@@ -104,7 +105,9 @@ LOCAL_PRELINK_MODULE := false
include $(BUILD_SHARED_LIBRARY)
+#########################################################################
# Build stand-alone quake executable on device
+#########################################################################
ifneq ($(BUILD_TINY_ANDROID),true)
ifeq ($(TARGET_ARCH),arm)
@@ -118,7 +121,7 @@ LOCAL_SHARED_LIBRARIES := libc libm libui libquake libEGL libGLESv1_CM
LOCAL_MODULE:= quake
-LOCAL_MODULE_TAGS := tests
+LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)