p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix RRO when LOCAL_EXPORT_PACKAGE_RESOURCES is unset 

If LOCAL_EXPORT_PACKAGE_RESOURCES is unset then
append_enforce_rro_sources was inserting a blank entry into
the 4th.  When converting the || separator back to space that
resulted in a two sequential spaces, which is treated as a
single word separator, causing the 5th field to be treated
as the 4th field.

Put "false" into the 4th field in soong_app_prebuilt.mk to match
package_internal.mk.

Bug: 123510624
Test: m SystemUIGoogle
Change-Id: I794c413e33df2020d0dc43379cfb017e7e09baa1
This commit is contained in:
Colin Cross 2019-01-28 12:56:17 -08:00 committed by Anton Hansson
parent 038177ba55
commit 89d3d2ae3b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/soong_app_prebuilt.mk
View File

@ -160,7 +160,7 @@ ifdef LOCAL_SOONG_RRO_DIRS
$(my_register_name), \
false, \
$(LOCAL_FULL_MANIFEST_FILE), \
$(LOCAL_EXPORT_PACKAGE_RESOURCES), \
$(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \
$(LOCAL_SOONG_RRO_DIRS))
endif