diff --git a/core/package_internal.mk b/core/package_internal.mk index 2ffbcd4d9..0c105e298 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -150,7 +150,7 @@ all_resources := $(strip $(my_res_resources) $(my_overlay_resources)) my_res_package := $(intermediates)/package-res.apk LOCAL_INTERMEDIATE_TARGETS += $(my_res_package) -# Always run aapt2 +# Always run aapt2, because we need to at least compile the AndroidManifest.xml. need_compile_res := true else # LOCAL_USE_AAPT2 diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 0b521d541..a9b21aeab 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -38,7 +38,14 @@ need_compile_res := # A static Java library needs to explicily set LOCAL_RESOURCE_DIR. ifdef LOCAL_RESOURCE_DIR need_compile_res := true +endif +ifdef LOCAL_USE_AAPT2 +ifneq ($(LOCAL_STATIC_ANDROID_LIBRARIES),) +need_compile_res := true +endif +endif +ifeq ($(need_compile_res),true) all_resources := $(strip \ $(foreach dir, $(LOCAL_RESOURCE_DIR), \ $(addprefix $(dir)/, \