openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Option to keep the generated R class in static Java libarry 

Bug: 6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.

Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
This commit is contained in:
Ying Wang 2012-04-26 12:26:33 -07:00
parent 486cca44a3
commit 83dbd2f158
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/clear_vars.mk
View File

@ -122,6 +122,9 @@ 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
# 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.

2
core/static_java_library.mk
View File

@ -39,9 +39,11 @@ ifneq (,$(all_resources))
# Those files will be excluded from the built jar. # Those files will be excluded from the built jar.
# The R/Manifest classes should be re-generated in the app Module instead. # The R/Manifest classes should be re-generated in the app Module instead.
# Use '' and $ escape because they will be passed to bash. # Use '' and $ escape because they will be passed to bash.
ifneq (true,$(LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY))
LOCAL_JAR_EXCLUDE_FILES := 'R.class' 'R$$*.class' 'Manifest.class' 'Manifest$$*.class' LOCAL_JAR_EXCLUDE_FILES := 'R.class' 'R$$*.class' 'Manifest.class' 'Manifest$$*.class'
endif endif
endif endif
endif
include $(BUILD_SYSTEM)/java_library.mk include $(BUILD_SYSTEM)/java_library.mk