Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT: Fix --feature-of to allow non-public symbol visibility

Browse Source 
Test: manual
Change-Id: Iada18b201c6463011002f96285a64c64565a6e1c
This commit is contained in:
Adam Lesinski
2017-01-24 16:16:09 -08:00
parent 9bbe787822
commit fa1e9d7ad0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/ResourceTable.cpp
View File

@@ -2204,8 +2204,10 @@ uint32_t ResourceTable::getResId(const String16& package,
package.string(), package.size(),
&specFlags);
if (rid != 0) {
if (onlyPublic) {
if ((specFlags & ResTable_typeSpec::SPEC_PUBLIC) == 0) {
if (onlyPublic && (specFlags & ResTable_typeSpec::SPEC_PUBLIC) == 0) {
// If this is a feature split and the resource has the same
// package name as us, then everything is public.
if (mPackageType != AppFeature || mAssetsPackage != package) {
return 0;
}
}