diff options
author | Jiyong Park <jiyong@google.com> | 2018-08-28 09:55:37 +0900 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2018-08-28 10:03:17 +0900 |
commit | 5baac54d58163f958aa9452ec58efc002d292097 (patch) | |
tree | 56148c1c85e7dfc27b98df9ce080560e4d084ec4 /cc/cc.go | |
parent | 09664bd9a509bfd5e97d3480855533547a4e1d52 (diff) | |
download | build_soong-5baac54d58163f958aa9452ec58efc002d292097.tar.gz build_soong-5baac54d58163f958aa9452ec58efc002d292097.tar.bz2 build_soong-5baac54d58163f958aa9452ec58efc002d292097.zip |
link type of recovery variant of a vendor module should not be native:vendor
This CL fixes a bug that when a module is configured as 'vendor: true' &&
'recovery_available: true', the link type of the recovery variant of the
module is incorrectly set to 'native:vendor'. This was because,
androidmk.go emits 'LOCAL_PROPRIETARY_MODULE := true' whenever
Proprietary property is set to true, regardless of whether it is a
recovery variant or not. This in turn makes LOCAL_USE_VNDK := true for
the module which in turn causes the link type to be 'native:vendor'.
Fixing the bug by resetting the properties like Proprietary, Vendor,
Soc_specific, etc. for the recovery variants.
Bug: 113277544
Test: m -j (test added)
Change-Id: I5d6ae76e46ef8fcd9204d386d0809862a7b0ff7e
Diffstat (limited to 'cc/cc.go')
-rw-r--r-- | cc/cc.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1741,6 +1741,7 @@ func imageMutator(mctx android.BottomUpMutatorContext) { } else if v == recoveryMode { m := mod[i].(*Module) m.Properties.InRecovery = true + m.MakeAsPlatform() squashRecoverySrcs(m) } } |