Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59ac10df authored by Andreas Gampe's avatar Andreas Gampe Committed by Gerrit Code Review
Browse files

Merge changes from topic 'cherry_pms_installd' 

* changes:
  Otapreopt: Allow A/B dexopt only when bootcomplete
  otapreopt: Collect and print size of artifacts
  Don't use profiles with vm safe mode
  Otapreopt: Try to mount vendor partition for A/B OTA
  Otapreopt: Add init script for A/B artifact move
  Otapreopt: Implement new A/B OTA path
  Installd: Add support for dex2oat very-large-app property
  Otapreopt: Send progress updates to update_engine
  Otapreopt: Filter preopted system apps
  Installd: Move app image A/B artifact
  Installd: Fix bad merge
  Installd: Change app image name computation
  Installd: Refactor dexopt to scoped file descriptor
  Installd: Remove string-helpers
  Otapreopt: Fix after shared-library work
parents 6fabbc60 45cebd0e

cmds/installd/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_SRC_FILES := otapreopt_script.sh



# Let this depend on otapreopt and the chroot tool, so we just have to mention one in a

# configuration.

LOCAL_REQUIRED_MODULES := otapreopt otapreopt_chroot

# Let this depend on otapreopt, the chroot tool and the slot script, so we just have to mention one

# in a configuration.

LOCAL_REQUIRED_MODULES := otapreopt otapreopt_chroot otapreopt_slot



include $(BUILD_PREBUILT)

cmds/installd/commands.cpp

+331 −126

File changed.

Preview size limit exceeded, changes collapsed.

cmds/installd/commands.h

+17 −3
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
namespace android {

namespace installd {



static constexpr size_t DEXOPT_PARAM_COUNT = 10U;



int create_app_data(const char *uuid, const char *pkgname, userid_t userid, int flags,

        appid_t appid, const char* seinfo, int target_sdk_version);

int restorecon_app_data(const char* uuid, const char* pkgName, userid_t userid, int flags,
@@ -56,9 +58,21 @@ bool merge_profiles(uid_t uid, const char *pkgname); 


bool dump_profile(uid_t uid, const char *pkgname, const char *dex_files);



int dexopt(const char *apk_path, uid_t uid, const char *pkgName, const char *instruction_set,

           int dexopt_needed, const char* oat_dir, int dexopt_flags, const char* compiler_filter,

           const char* volume_uuid, const char* shared_libraries);

int dexopt(const char *apk_path,

           uid_t uid,

           const char *pkgName,

           const char *instruction_set,

           int dexopt_needed,

           const char* oat_dir,

           int dexopt_flags,

           const char* compiler_filter,

           const char* volume_uuid,

           const char* shared_libraries);

static_assert(DEXOPT_PARAM_COUNT == 10U, "Unexpected dexopt param size");



// Helper for the above, converting arguments.

int dexopt(const char* const params[DEXOPT_PARAM_COUNT]);



int mark_boot_complete(const char *instruction_set);

int linklib(const char* uuid, const char* pkgname, const char* asecLibDir, int userId);

int idmap(const char *target_path, const char *overlay_path, uid_t uid);

cmds/installd/globals.cpp

+18 −2

File changed.

Preview size limit exceeded, changes collapsed.

cmds/installd/globals.h

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
namespace android {

namespace installd {



/* constants */



// Name of the environment variable that contains the asec mountpoint.

static constexpr const char* ASEC_MOUNTPOINT_ENV_NAME = "ASEC_MOUNTPOINT";



/* data structures */



struct dir_rec_t {