summaryrefslogtreecommitdiff
path: root/java/sdk_library.go
diff options
context:
space:
mode:
author Sasha Smundak <asmundak@google.com> 2019-03-08 15:43:26 -0800
committer Sasha Smundak <asmundak@google.com> 2019-03-11 10:11:17 -0700
commit177a1a589d97385324fe73ecc24dae0befde44b4 (patch)
treef4b9977f967cf512a70d578b4f3838622b181507 /java/sdk_library.go
parentfdd1457fa683d5a7c21c471d5dc3294cdb29cf1e (diff)
Fix crash in mergeListProperties
The value of a property to be merged may be a reference to a variable. When we first create an attribute for a makefile variable (e.g. we create 'android_static_libs' from LOCAL_STATIC_ANDROID_LIBRARIES), we set its type correctly. However, reparse in bpfix erases this information, so by the time 'android_static_libs' attribute is to be merged with 'static_libs', it has no type and merge occurs. It isn't easy to fix properly, so just don't merge in such case, Soong will complain and it will be fixed manually. Fixes: 125519127 Test: unit tests in androidmk_test.go Change-Id: Ic66d7ab686a2fdde987f32e2b204c72d9bf0d026
Diffstat (limited to 'java/sdk_library.go')
0 files changed, 0 insertions, 0 deletions