tree 9b3d1a66cd205a517dd2f076b0629f52214313a6
parent 3b801ca7fb6b530551deda32624441198eaaddef
author Colin Cross <ccross@android.com> 1527107753 -0700
committer Colin Cross <ccross@android.com> 1527107955 -0700

Support LOCAL_STATIC_JAVA_AAR_LIBRARIES with aapt2

LOCAL_STATIC_JAVA_AAR_LIBRARIES are slightly different from
LOCAL_STATIC_ANDROID_LIBRARIES, due to b/78447299 the
AndroidManifest.xml from ANDROID libraries are ignored.
Temporarily add support for LOCAL_STATIC_JAVA_AAR_LIBRARIES
when using LOCAL_USE_AAPT2 := true, treating them the same
as LOCAL_STATIC_ANDROID_LIBRARIES except that they are
merged by android_manifest.xml

Bug: 78447299
Bug: 79481102
Test: m FORCE_AAPT2=true checkbuild
Change-Id: Ia6210810c1ea6e776be97ae1c9a586b5de844125