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

Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev

Browse source
This commit is contained in:
Ying Wang 2012-06-19 14:25:14 -07:00 committed by Android (Google) Code Review
commit 0872a01065
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/clear_vars.mk
View file

@ -122,9 +122,7 @@ LOCAL_CTS_TEST_PACKAGE:=
LOCAL_CTS_TEST_RUNNER:= LOCAL_CTS_TEST_RUNNER:=
LOCAL_CLANG:= LOCAL_CLANG:=
LOCAL_ADDRESS_SANITIZER:= LOCAL_ADDRESS_SANITIZER:=
# Whether to keep the generated R/Manifest classes when building static Java library LOCAL_JAR_EXCLUDE_FILES:=
# with Android resource. false(default), or true
LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY:=
# 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.

8
core/definitions.mk
View file

@ -81,6 +81,10 @@ ALL_FINDBUGS_FILES:=
# GPL module license files # GPL module license files
ALL_GPL_MODULE_LICENSE_FILES:= ALL_GPL_MODULE_LICENSE_FILES:=
# Generated class file names for Android resource.
# They are escaped and quoted so can be passed safely to a bash command.
ANDROID_RESOURCE_GENERATED_CLASSES := 'R.class' 'R$$*.class' 'Manifest.class' 'Manifest$$*.class'
########################################################### ###########################################################
## Debugging; prints a variable list to stdout ## Debugging; prints a variable list to stdout
########################################################### ###########################################################
@ -1515,6 +1519,10 @@ fi
$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list
$(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
$(hide) rm -f $@ $(hide) rm -f $@
$(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) \ $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \
$@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) . $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
$(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp $(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp

17
core/static_java_library.mk
View file

@ -36,14 +36,18 @@ all_resources := $(strip \
)) ))
ifneq (,$(all_resources)) ifneq (,$(all_resources))
# Those files will be excluded from the built jar. # By default we should remove the R/Manifest classes from a static Java library,
# The R/Manifest classes should be re-generated in the app Module instead. # because they will be regenerated in the app that uses it.
# Use '' and $ escape because they will be passed to bash. # But if the static Java library will be used by a library, then we may need to
ifneq (true,$(LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY)) # keep the generated classes with "LOCAL_JAR_EXCLUDE_FILES := none".
LOCAL_JAR_EXCLUDE_FILES := 'R.class' 'R$$*.class' 'Manifest.class' 'Manifest$$*.class' ifndef LOCAL_JAR_EXCLUDE_FILES
endif LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)
endif endif
ifeq (none,$(LOCAL_JAR_EXCLUDE_FILES))
LOCAL_JAR_EXCLUDE_FILES :=
endif endif
endif # all_resources
endif # LOCAL_RESOURCE_DIR
include $(BUILD_SYSTEM)/java_library.mk include $(BUILD_SYSTEM)/java_library.mk
@ -107,4 +111,3 @@ endif
endif # $(all_resources) not empty endif # $(all_resources) not empty
LOCAL_IS_STATIC_JAVA_LIBRARY := LOCAL_IS_STATIC_JAVA_LIBRARY :=
LOCAL_JAR_EXCLUDE_FILES :=