Add optional tags to libcore.

Change-Id: Iac339144ed448848c96852da8d301d528ebfa0e6

JavaLibrary.mk

@@ -77,7 +77,7 @@ LOCAL_DX_FLAGS := --core-library
 
 LOCAL_NO_EMMA_INSTRUMENT := true
 LOCAL_NO_EMMA_COMPILE := true
-
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core
 
 include $(BUILD_JAVA_LIBRARY)
@@ -90,6 +90,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-main-java-files-under,junit)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LIBRARIES := core
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := core-junit
 include $(BUILD_JAVA_LIBRARY)
 
@@ -110,6 +111,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-main-java-files-under,sqlite-jdbc)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LIBRARIES := core
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := sqlite-jdbc
 include $(BUILD_JAVA_LIBRARY)
 
@@ -288,8 +290,8 @@ ifeq ($(WITH_HOST_DALVIK),true)
     LOCAL_NO_EMMA_COMPILE := true
     LOCAL_BUILD_HOST_DEX := true
 
-    LOCAL_MODULE := core-hostdex
     LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE := core-hostdex
 
     include $(BUILD_HOST_JAVA_LIBRARY)
 

NativeCode.mk

@@ -97,6 +97,7 @@ LOCAL_SRC_FILES := $(core_src_files)
 LOCAL_C_INCLUDES := $(core_c_includes)
 LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)
 LOCAL_STATIC_LIBRARIES := $(core_static_libraries)
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libjavacore
 include $(BUILD_STATIC_LIBRARY)
 
@@ -120,6 +121,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
     LOCAL_C_INCLUDES := $(core_c_includes)
     LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)
     LOCAL_STATIC_LIBRARIES := $(core_static_libraries)
+    LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libjavacore-host
     LOCAL_ADDITIONAL_DEPENDENCIES += $(HOST_OUT)/etc/security/cacerts.bks
     include $(BUILD_HOST_STATIC_LIBRARY)

sqlite-jdbc/Android.mk

@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
 LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
 LOCAL_SHARED_LIBRARIES += libsqlite
+LOCAL_MODULE_TAGS := optional
 # This name is dictated by the fact that the SQLite code calls loadLibrary("sqlite_jni").
 LOCAL_MODULE := libsqlite_jni
 TARGET_PRELINK_MODULE := false
@@ -22,7 +23,8 @@ ifeq ($(WITH_HOST_DALVIK),true)
     LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
     LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
     LOCAL_SHARED_LIBRARIES += libsqlite
+    LOCAL_MODULE_TAGS := optional
     LOCAL_MODULE := libsqlite_jni
     TARGET_PRELINK_MODULE := false
     include $(BUILD_HOST_SHARED_LIBRARY)
-endif
\ No newline at end of file
+endif