tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 18c8d9eb: am 3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF

Browse source 
* commit '18c8d9eb1e0c0776862d554f0834e7ee3018375a':
  Add LOCAL_DONT_DELETE_JAR_META_INF
This commit is contained in:
Ying Wang 2012-08-30 14:16:31 -07:00 committed by Android Git Automerger
commit fb12f71fe7
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/clear_vars.mk
View file

@ -126,6 +126,8 @@ LOCAL_ADDRESS_SANITIZER:=
LOCAL_JAR_EXCLUDE_FILES:= LOCAL_JAR_EXCLUDE_FILES:=
LOCAL_LINT_FLAGS:= LOCAL_LINT_FLAGS:=
LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
# Don't delete the META_INF dir when merging static Java libraries.
LOCAL_DONT_DELETE_JAR_META_INF:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

4
core/definitions.mk
View file

@ -1433,8 +1433,8 @@ define unzip-jar-files
exit 1; \ exit 1; \
fi; \ fi; \
unzip -qo $$f -d $(2); \ unzip -qo $$f -d $(2); \
(cd $(2) && rm -rf META-INF); \ done \
done $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,;rm -rf $(2)/META-INF)
endef endef
# Common definition to invoke javac on the host and target. # Common definition to invoke javac on the host and target.

1
core/java.mk
View file

@ -259,6 +259,7 @@ ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar)
# via deps on the target that generates the sources. # via deps on the target that generates the sources.
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
$(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) \ $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) \
$(RenderScript_file_stamp) $(proto_java_sources_file_stamp) $(RenderScript_file_stamp) $(proto_java_sources_file_stamp)
$(transform-java-to-classes.jar) $(transform-java-to-classes.jar)