StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix resource overlay order for static libraries"

Browse Source
This commit is contained in:
Colin Cross
2019-02-15 18:54:49 +00:00
committed by Gerrit Code Review
parent 611a99da84 b11fc29b13
commit dba735e9a5
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/static_java_library.mk
View File

@@ -85,14 +85,22 @@ R_file_stamp := $(intermediates.COMMON)/src/R.stamp
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp) LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
ifeq ($(LOCAL_USE_AAPT2),true) ifeq ($(LOCAL_USE_AAPT2),true)
# For library we treat all the resource equal with no overlay. ifneq ($(strip $(LOCAL_STATIC_ANDROID_LIBRARIES) $(LOCAL_STATIC_JAVA_AAR_LIBRARIES)),)
my_res_resources := $(all_resources) # If we are using static android libraries, every source file becomes an overlay.
my_overlay_resources := # This is to emulate old AAPT behavior which simulated library support.
# For libraries put everything in the COMMON intermediate directory. my_res_resources :=
my_res_package := $(intermediates.COMMON)/package-res.apk my_overlay_resources := $(all_resources)
else
# Otherwise, for a library we treat all the resource equal with no overlay.
my_res_resources := $(all_resources)
my_overlay_resources :=
endif
# For libraries put everything in the COMMON intermediate directory.
my_res_package := $(intermediates.COMMON)/package-res.apk
LOCAL_INTERMEDIATE_TARGETS += $(my_res_package) LOCAL_INTERMEDIATE_TARGETS += $(my_res_package)
endif # LOCAL_USE_AAPT2 endif # LOCAL_USE_AAPT2
endif # need_compile_res endif # need_compile_res
all_res_assets := $(all_resources) all_res_assets := $(all_resources)