From 5758b8ed96783861c72b94a822c0ed581f414388 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 15 Dec 2011 16:36:55 -0800 Subject: Remove the R/Manifest classes when building the static Java library Bug: 5448433 Instead of deferring the removal to building the app. In that case any R/Manifest classes in any static Java libraries will be deleted, no matter if they are generated from Android resource, or just source R.java/Manifest.java in the source tree by accident. Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8 --- core/host_java_library.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/host_java_library.mk') diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 322d10f..6cc0b1f 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -52,6 +52,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): \ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) +$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) $(transform-host-java-to-package) @@ -87,6 +88,7 @@ endif else $(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) +$(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) $(transform-host-java-to-package) endif # LOCAL_BUILD_HOST_DEX -- cgit v1.1