From dfc3f6aaeefceda4ff0337fa0e51eab83c0c820e Mon Sep 17 00:00:00 2001
From: yingying <yingying@codeaurora.org>
Date: Mon, 27 Oct 2014 19:13:53 +0800
Subject: androidfw: Use the last package to create idmap.

Overlaid packages contain one or two package groups, the first one is
system package(android), and the second one is application package. So
it should use the last package group to create idmap.

When inspecting the idmap, similar as above.

Change-Id: I97e0179bc5b5acdcacbe6ec5b5b7c22af51d1d0b
---
 cmds/idmap/inspect.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmds')

diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp
index f6afc85..63756a5 100644
--- a/cmds/idmap/inspect.cpp
+++ b/cmds/idmap/inspect.cpp
@@ -223,7 +223,8 @@ namespace {
     }
 
     status_t parse_data(IdmapBuffer& buf, const AssetManager& am) {
-        const uint32_t packageId = am.getResources().getBasePackageId(0);
+        const ResTable& rt = am.getResources();
+        const uint32_t packageId = rt.getBasePackageId(rt.getBasePackageCount() - 1);
 
         uint16_t data16;
         status_t err = buf.nextUint16(&data16);
-- 
cgit v1.1


From f1642d87c5cc6783f5ef16e3cbadbd098f086111 Mon Sep 17 00:00:00 2001
From: yingying <yingying@codeaurora.org>
Date: Thu, 4 Sep 2014 10:36:54 +0800
Subject: base: Fix the problems for runtime overlay.

 - There is no need to make the string blocking when adding the asset
   path, as it will be made by the resources.
 - After adding the overlay path, it also needs to update the string
   blocks.
 - Scan all the sub folders for framework overlay res.

Change-Id: Iaad019111ae364c319e58dce57dbf4647b38d4c3
CRs-Fixed: 763809
---
 cmds/idmap/scan.cpp | 99 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 39 deletions(-)

(limited to 'cmds')

diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp
index 612a7eb..6a6d8dc 100644
--- a/cmds/idmap/scan.cpp
+++ b/cmds/idmap/scan.cpp
@@ -165,6 +165,62 @@ namespace {
         delete dataMap;
         return priority;
     }
+
+    int idmap_scan(const char *overlay_dir, const char *target_package_name,
+            const char *target_apk_path, const char *idmap_dir,
+            SortedVector<Overlay>& overlayVector)
+    {
+        DIR *dir = opendir(overlay_dir);
+        if (dir == NULL) {
+            return EXIT_FAILURE;
+        }
+
+        struct dirent *dirent;
+        while ((dirent = readdir(dir)) != NULL) {
+            struct stat st;
+            char overlay_apk_path[PATH_MAX + 1];
+            snprintf(overlay_apk_path, PATH_MAX, "%s/%s", overlay_dir, dirent->d_name);
+            if (stat(overlay_apk_path, &st) < 0) {
+                continue;
+            }
+            if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) {
+                continue;
+            }
+
+            if (S_ISDIR(st.st_mode)) {
+                String8 dir_name = String8(overlay_apk_path).getPathLeaf();
+                if (dir_name == "." || dir_name == "..") {
+                    // Skip the "." and ".." dir.
+                    continue;
+                }
+                idmap_scan(overlay_apk_path, target_package_name, target_apk_path, idmap_dir,
+                        overlayVector);
+            } else {
+                int priority = parse_apk(overlay_apk_path, target_package_name);
+                if (priority < 0) {
+                    continue;
+                }
+
+                String8 idmap_path(idmap_dir);
+                idmap_path.appendPath(flatten_path(overlay_apk_path + 1));
+                idmap_path.append("@idmap");
+
+                if (idmap_create_path(target_apk_path, overlay_apk_path,
+                        idmap_path.string()) != 0) {
+                    ALOGE("error: failed to create idmap for target=%s overlay=%s idmap=%s\n",
+                            target_apk_path, overlay_apk_path, idmap_path.string());
+                    continue;
+                }
+
+                Overlay overlay(String8(overlay_apk_path), idmap_path, priority);
+                overlayVector.add(overlay);
+            }
+        }
+
+        closedir(dir);
+
+        return EXIT_SUCCESS;
+    }
 }
 
 int idmap_scan(const char *overlay_dir, const char *target_package_name,
@@ -176,48 +232,13 @@ int idmap_scan(const char *overlay_dir, const char *target_package_name,
         return EXIT_FAILURE;
     }
 
-    DIR *dir = opendir(overlay_dir);
-    if (dir == NULL) {
-        return EXIT_FAILURE;
-    }
-
     SortedVector<Overlay> overlayVector;
-    struct dirent *dirent;
-    while ((dirent = readdir(dir)) != NULL) {
-        struct stat st;
-        char overlay_apk_path[PATH_MAX + 1];
-        snprintf(overlay_apk_path, PATH_MAX, "%s/%s", overlay_dir, dirent->d_name);
-        if (stat(overlay_apk_path, &st) < 0) {
-            continue;
-        }
-        if (!S_ISREG(st.st_mode)) {
-            continue;
-        }
-
-        int priority = parse_apk(overlay_apk_path, target_package_name);
-        if (priority < 0) {
-            continue;
-        }
-
-        String8 idmap_path(idmap_dir);
-        idmap_path.appendPath(flatten_path(overlay_apk_path + 1));
-        idmap_path.append("@idmap");
-
-        if (idmap_create_path(target_apk_path, overlay_apk_path, idmap_path.string()) != 0) {
-            ALOGE("error: failed to create idmap for target=%s overlay=%s idmap=%s\n",
-                    target_apk_path, overlay_apk_path, idmap_path.string());
-            continue;
-        }
-
-        Overlay overlay(String8(overlay_apk_path), idmap_path, priority);
-        overlayVector.add(overlay);
-    }
-
-    closedir(dir);
+    int res = idmap_scan(overlay_dir, target_package_name, target_apk_path, idmap_dir,
+            overlayVector);
 
-    if (!writePackagesList(filename.string(), overlayVector)) {
+    if (res == EXIT_FAILURE || !writePackagesList(filename.string(), overlayVector)) {
         return EXIT_FAILURE;
     }
 
-    return EXIT_SUCCESS;
+    return res;
 }
-- 
cgit v1.1