diff options
| author | Ying Wang <wangying@google.com> | 2014-06-25 13:23:58 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-25 14:25:14 -0700 |
| commit | 6129192ed60c702163437252595cb1fb8064fa02 (patch) | |
| tree | df32caae5a1d91ec00a4f057c15bfd0358f887ba /core/static_java_library.mk | |
| parent | e69d4350cd4af04349b703ba169ba516a96913ba (diff) | |
| download | build-6129192ed60c702163437252595cb1fb8064fa02.zip build-6129192ed60c702163437252595cb1fb8064fa02.tar.gz build-6129192ed60c702163437252595cb1fb8064fa02.tar.bz2 | |
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Bug: 15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
Diffstat (limited to 'core/static_java_library.mk')
| -rw-r--r-- | core/static_java_library.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/static_java_library.mk b/core/static_java_library.mk index f95a382..79b7292 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -26,7 +26,10 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES # Hack to build static Java library with Android resource # See bug 5714516 all_resources := +need_compile_res := +# A static Java library needs to explicily set LOCAL_RESOURCE_DIR. ifdef LOCAL_RESOURCE_DIR +need_compile_res := true all_resources := $(strip \ $(foreach dir, $(LOCAL_RESOURCE_DIR), \ $(addprefix $(dir)/, \ @@ -36,7 +39,6 @@ all_resources := $(strip \ ) \ )) -ifneq (,$(all_resources)) # By default we should remove the R/Manifest classes from a static Java library, # because they will be regenerated in the app that uses it. # But if the static Java library will be used by a library, then we may need to @@ -56,14 +58,13 @@ ifneq ($(LOCAL_PROGUARD_ENABLED),custom) endif LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) -endif # all_resources endif # LOCAL_RESOURCE_DIR all_res_assets := $(all_resources) include $(BUILD_SYSTEM)/java_library.mk -ifneq (,$(all_resources)) +ifeq (true,$(need_compile_res)) R_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.stamp ifeq ($(strip $(LOCAL_MANIFEST_FILE)),) @@ -124,7 +125,7 @@ ifneq ($(full_classes_jar),) $(full_classes_compiled_jar): $(R_file_stamp) endif -endif # $(all_resources) not empty +endif # need_compile_res # Reset internal variables. all_res_assets := |