diff options
| author | Ying Wang <wangying@google.com> | 2011-12-15 16:36:55 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-12-15 16:36:55 -0800 |
| commit | 5758b8ed96783861c72b94a822c0ed581f414388 (patch) | |
| tree | 5399ec6f281fc3ca327d864cbc507883c78c19b4 /core/definitions.mk | |
| parent | bf6c611cae9c8c3540bed07cd3864026a48ca229 (diff) | |
| download | build-5758b8ed96783861c72b94a822c0ed581f414388.zip build-5758b8ed96783861c72b94a822c0ed581f414388.tar.gz build-5758b8ed96783861c72b94a822c0ed581f414388.tar.bz2 | |
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
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 60cd063..b7a74b6 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1408,9 +1408,6 @@ endef # For a list of jar files, unzip them to a specified directory, # but make sure that no META-INF files come along for the ride. -# We also remove any R.class/Manifest.class from the jar files; -# R/Manifest class for the static Java libraries should be -# re-generate in the app module instead. # # $(1): files to unzip # $(2): destination directory @@ -1424,7 +1421,6 @@ define unzip-jar-files unzip -qo $$f -d $(2); \ (cd $(2) && rm -rf META-INF); \ done - # $(hide) find $(2) -name 'R.class' -o -name 'R$$*.class' -o -name 'Manifest.class' -o -name 'Manifest$$*.class' | xargs rm -rf endef # Common definition to invoke javac on the host and target. @@ -1464,6 +1460,10 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the fi $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq +$(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ + -name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \ + $(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \ + | xargs rm -rf) $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \ $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) . endef |