From 432bff01ec67533dbbb6ed27cb190c99e83ea226 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Tue, 5 Jan 2010 16:27:19 -0800 Subject: [PATCH] Do not use a user tag on apps, as it is ignored. The build system does not honor user tags on apps, and setting it is misleading. This removes the confusion by making the makefiles behave like they read. Change-Id: I7c5feba1c7d07f915b97dd098584f29938a4c885 --- core/res/Android.mk | 2 +- opengl/tests/gl2_jni/Android.mk | 2 +- opengl/tests/gl_jni/Android.mk | 2 +- opengl/tests/gldual/Android.mk | 2 +- packages/SettingsProvider/Android.mk | 2 +- packages/TtsService/Android.mk | 2 +- packages/VpnServices/Android.mk | 2 +- tests/appwidgets/AppWidgetHostTest/Android.mk | 2 +- tests/appwidgets/AppWidgetProviderTest/Android.mk | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/res/Android.mk b/core/res/Android.mk index 78cb86dd90274..7d11148161a83 100644 --- a/core/res/Android.mk +++ b/core/res/Android.mk @@ -24,7 +24,7 @@ LOCAL_CERTIFICATE := platform # since these resources will be used by many apps. LOCAL_AAPT_FLAGS := -x -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional # Install this alongside the libraries. LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES) diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 81247dfcfbfe8..384966c82a4fd 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -11,7 +11,7 @@ TOP_LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index 4029fa1261060..f1bd31dad4059 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -11,7 +11,7 @@ TOP_LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index e73c249fef9bb..995a5d703f428 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -11,7 +11,7 @@ TOP_LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/packages/SettingsProvider/Android.mk b/packages/SettingsProvider/Android.mk index 724e988f737a5..bf4ab1b70aeb6 100644 --- a/packages/SettingsProvider/Android.mk +++ b/packages/SettingsProvider/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/packages/TtsService/Android.mk b/packages/TtsService/Android.mk index 2737fb4387c65..5eb6b9c102d8b 100644 --- a/packages/TtsService/Android.mk +++ b/packages/TtsService/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) \ diff --git a/packages/VpnServices/Android.mk b/packages/VpnServices/Android.mk index eb27ed5d2171f..6cdf67438ed8b 100644 --- a/packages/VpnServices/Android.mk +++ b/packages/VpnServices/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/tests/appwidgets/AppWidgetHostTest/Android.mk b/tests/appwidgets/AppWidgetHostTest/Android.mk index 1bb1e5482b048..4d0c704fc812a 100644 --- a/tests/appwidgets/AppWidgetHostTest/Android.mk +++ b/tests/appwidgets/AppWidgetHostTest/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) diff --git a/tests/appwidgets/AppWidgetProviderTest/Android.mk b/tests/appwidgets/AppWidgetProviderTest/Android.mk index c87a0f2dcf3ff..6084fb907c076 100644 --- a/tests/appwidgets/AppWidgetProviderTest/Android.mk +++ b/tests/appwidgets/AppWidgetProviderTest/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files)