commit e58539749731157a29eafea62662a399adc8bb28
author Ying Wang <wangying@google.com> Tue Mar 01 12:06:47 2016 -0800
committer Ying Wang <wangying@google.com> Tue Mar 01 12:08:26 2016 -0800
tree 6f729aa5402e3593d1483da9a131e9ba9a88b4dc
parent 837d60f49a5c764bd427c7d8b75d291c83344984

Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES

We expect to build the module's own packare-res.apk from the
LOCAL_STATIC_ANDROID_LIBRARIES in this case.

Bug: 25958912
Change-Id: I4d0294c867f5fb636983d630493a3b188279cae9

core/static_java_library.mk

diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index 0b521d5..a9b21ae 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -38,7 +38,14 @@
 # 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)/, \