am ca60ba1: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
  Move app-lib definition up for system app scanning

Author: kruton

services/java/com/android/server/pm/PackageManagerService.java

@@ -1009,6 +1009,8 @@ public PackageManagerService(Context context, Installer installer,
 
             File dataDir = Environment.getDataDirectory();
             mAppDataDir = new File(dataDir, "data");
+            mAppInstallDir = new File(dataDir, "app");
+            mAppLibInstallDir = new File(dataDir, "app-lib");
             mAsecInternalPath = new File(dataDir, "app-asec").getPath();
             mUserAppDataDir = new File(dataDir, "user");
             mDrmAppPrivateInstallDir = new File(dataDir, "app-private");
@@ -1218,8 +1220,6 @@ public PackageManagerService(Context context, Installer installer,
                 }
             }
 
-            mAppInstallDir = new File(dataDir, "app");
-            mAppLibInstallDir = new File(dataDir, "app-lib");
             //look for any incomplete package installations
             ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr();
             //clean up list