From 7197d91eb7dfbd0f5b065b56d4f391019e71d03a Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Wed, 18 Mar 2015 15:24:18 +0100 Subject: RRO: idmap: fix sorting of overlays.list Multiple overlay packages with targetPackage="android" are loaded in the wrong order due to the incorrect order they are listed in overlays.list. This will cause runtime resource overlay to fail when multiple overlay packages target the same resources in framework-res.apk. Correct the order in which overlays are loaded by changing the sorting of overlays.list. Background: commit f90f2f8d changed the order in which overlay packages should be added to ResTables. The expected order is now in ascending priority. This must be reflected in overlays.list. Change-Id: I249984c0e34b6009e7280ce2777750c76ab16e37 --- cmds/idmap/scan.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'cmds/idmap/scan.cpp') diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp index 612a7ebb5489..7a6682237fe9 100644 --- a/cmds/idmap/scan.cpp +++ b/cmds/idmap/scan.cpp @@ -25,8 +25,7 @@ namespace { bool operator<(Overlay const& rhs) const { - // Note: order is reversed by design - return rhs.priority < priority; + return rhs.priority > priority; } String8 apk_path; -- cgit v1.2.3-59-g8ed1b