Add optional tags to dalvik.
Change-Id: I29a78ccb6312d12b3ef0ed02cfbc638a5b01db9c
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index 21b7805..b7dda0f 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -41,6 +41,7 @@
libssl \
libz
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dalvikvm
include $(BUILD_EXECUTABLE)
@@ -64,9 +65,9 @@
else
LOCAL_LDLIBS += -ldl -lpthread
LOCAL_SHARED_LIBRARIES += libdvm libcrypto libicuuc libicui18n libssl
-# LOCAL_STATIC_LIBRARIES += libcutils liblog libdex libexpat libnativehelper libutils libz
endif
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dalvikvm
include $(BUILD_HOST_EXECUTABLE)
diff --git a/dexdump/Android.mk b/dexdump/Android.mk
index 026067b..89749d6 100644
--- a/dexdump/Android.mk
+++ b/dexdump/Android.mk
@@ -43,7 +43,7 @@
LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries) libz liblog
LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := optional
LOCAL_LDLIBS +=
include $(BUILD_EXECUTABLE)
@@ -58,6 +58,7 @@
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
include $(CLEAR_VARS)
LOCAL_MODULE := dexdump
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(dexdump_src_files)
LOCAL_C_INCLUDES := $(dexdump_c_includes)
LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries)
diff --git a/dexlist/Android.mk b/dexlist/Android.mk
index 27b6a59..aacdfb5 100644
--- a/dexlist/Android.mk
+++ b/dexlist/Android.mk
@@ -33,6 +33,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := dexlist
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(dexdump_src_files)
LOCAL_C_INCLUDES := $(dexdump_c_includes)
LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries) libcutils libz
@@ -42,6 +43,7 @@
include $(CLEAR_VARS)
LOCAL_MODULE := dexlist
+LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(dexdump_src_files)
LOCAL_C_INCLUDES := $(dexdump_c_includes)
LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries)
diff --git a/dexopt/Android.mk b/dexopt/Android.mk
index 96ec3b2..3bb98a5 100644
--- a/dexopt/Android.mk
+++ b/dexopt/Android.mk
@@ -43,6 +43,7 @@
LOCAL_SRC_FILES := $(local_src_files)
LOCAL_C_INCLUDES := $(local_c_includes)
LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog libnativehelper libutils libz
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dexopt
include $(BUILD_EXECUTABLE)
@@ -54,6 +55,7 @@
LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libnativehelper libutils libz
LOCAL_LDLIBS += -ldl -lpthread
LOCAL_CFLAGS += -DANDROID_SMP=1
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dexopt
include $(BUILD_HOST_EXECUTABLE)
endif
diff --git a/dvz/Android.mk b/dvz/Android.mk
index 72b92a0..4e4387e 100644
--- a/dvz/Android.mk
+++ b/dvz/Android.mk
@@ -13,6 +13,7 @@
LOCAL_CFLAGS :=
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dvz
include $(BUILD_EXECUTABLE)
diff --git a/dx/Android.mk b/dx/Android.mk
index deb84c9..3abf21a 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -14,6 +14,7 @@
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dx
include $(BUILD_SYSTEM)/base_rules.mk
@@ -33,6 +34,7 @@
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := jasmin
include $(BUILD_SYSTEM)/base_rules.mk
@@ -50,6 +52,7 @@
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := jasmin.jar
include $(BUILD_SYSTEM)/base_rules.mk
diff --git a/dx/src/Android.mk b/dx/src/Android.mk
index 7ab32b2..80d1b85 100644
--- a/dx/src/Android.mk
+++ b/dx/src/Android.mk
@@ -11,7 +11,7 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
-
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= dx
include $(BUILD_HOST_JAVA_LIBRARY)
@@ -25,7 +25,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-subdir-html-files)
-
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= dx
LOCAL_DROIDDOC_OPTIONS := -hidden
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
diff --git a/libdex/Android.mk b/libdex/Android.mk
index af33baf..558a7e5 100644
--- a/libdex/Android.mk
+++ b/libdex/Android.mk
@@ -48,6 +48,7 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(dex_src_files)
LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libdex
include $(BUILD_STATIC_LIBRARY)
@@ -62,5 +63,6 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(dex_src_files)
LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libdex
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk
index b2056c6..630eec3 100644
--- a/libnativehelper/Android.mk
+++ b/libnativehelper/Android.mk
@@ -53,7 +53,7 @@
LOCAL_C_INCLUDES := $(c_includes)
LOCAL_STATIC_LIBRARIES := $(static_libraries)
LOCAL_SHARED_LIBRARIES := $(shared_libraries) libcutils libexpat liblog libutils libz
-
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libnativehelper
include $(BUILD_SHARED_LIBRARY)
@@ -81,6 +81,7 @@
LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libutils libz
endif
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libnativehelper
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/tools/dexdeps/Android.mk b/tools/dexdeps/Android.mk
index 9c2cec7..e1b7e73 100644
--- a/tools/dexdeps/Android.mk
+++ b/tools/dexdeps/Android.mk
@@ -22,6 +22,7 @@
# ============================================================
include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE := dexdeps
diff --git a/tools/dexdeps/src/Android.mk b/tools/dexdeps/src/Android.mk
index 7c0ef2f..8e4abaf 100644
--- a/tools/dexdeps/src/Android.mk
+++ b/tools/dexdeps/src/Android.mk
@@ -21,7 +21,7 @@
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
-
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= dexdeps
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/dmtracedump/Android.mk b/tools/dmtracedump/Android.mk
index e3f321e..5d3146e 100644
--- a/tools/dmtracedump/Android.mk
+++ b/tools/dmtracedump/Android.mk
@@ -11,6 +11,7 @@
LOCAL_SRC_FILES := TraceDump.c
LOCAL_CFLAGS += -O0 -g
LOCAL_C_INCLUDES += dalvik/vm
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := dmtracedump
include $(BUILD_HOST_EXECUTABLE)
@@ -18,5 +19,6 @@
LOCAL_SRC_FILES := CreateTestTrace.c
LOCAL_CFLAGS += -O0 -g
LOCAL_C_INCLUDES += dalvik/vm
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := create_test_dmtrace
include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/hprof-conv/Android.mk b/tools/hprof-conv/Android.mk
index 3d39d7b..dad399e 100644
--- a/tools/hprof-conv/Android.mk
+++ b/tools/hprof-conv/Android.mk
@@ -16,5 +16,6 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := HprofConv.c
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := hprof-conv
include $(BUILD_HOST_EXECUTABLE)
diff --git a/vm/Android.mk b/vm/Android.mk
index 98f004c..3110639 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -48,7 +48,7 @@
LOCAL_PRELINK_MODULE := true
endif
endif
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libdvm
LOCAL_CFLAGS += $(target_smp_flag)
include $(BUILD_SHARED_LIBRARY)
@@ -129,6 +129,7 @@
endif
LOCAL_CFLAGS += $(host_smp_flag)
+ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libdvm
include $(BUILD_HOST_SHARED_LIBRARY)