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

Commit 0f70df22 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Filename refactoring, remove DEXOPT_OTA flag." am: 68603971 am: 4f1d7392 am: 00ee711d 

am: 671ccdfc

Change-Id: I9b16e7c1dfe6650b2a63ec0e45e8818b3af228be
parents c996ed87 671ccdfc

cmds/installd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ cc_defaults { 
        "-Werror",

    ],

    srcs: [

        "commands.cpp",

        "InstalldNativeService.cpp",

        "dexopt.cpp",

        "globals.cpp",

        "utils.cpp",

cmds/installd/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ LOCAL_CFLAGS += -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) 
LOCAL_CFLAGS += -DART_BASE_ADDRESS_MIN_DELTA=$(LOCAL_LIBART_IMG_HOST_MIN_BASE_ADDRESS_DELTA)

LOCAL_CFLAGS += -DART_BASE_ADDRESS_MAX_DELTA=$(LOCAL_LIBART_IMG_HOST_MAX_BASE_ADDRESS_DELTA)



LOCAL_SRC_FILES := otapreopt.cpp commands.cpp globals.cpp utils.cpp dexopt.cpp binder/android/os/IInstalld.aidl

LOCAL_SRC_FILES := otapreopt.cpp InstalldNativeService.cpp globals.cpp utils.cpp dexopt.cpp binder/android/os/IInstalld.aidl

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libbinder \

cmds/installd/commands.cpp→cmds/installd/InstalldNativeService.cpp

+5 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
** limitations under the License.

*/



#include "commands.h"

#include "InstalldNativeService.h"



#include <errno.h>

#include <inttypes.h>
@@ -42,12 +42,11 @@ 
#include <selinux/android.h>

#include <system/thread_defs.h>



#include <globals.h>

#include <installd_deps.h>

#include <otapreopt_utils.h>

#include <utils.h>



#include "dexopt.h"

#include "globals.h"

#include "installd_deps.h"

#include "otapreopt_utils.h"

#include "utils.h"



#ifndef LOG_TAG

#define LOG_TAG "installd"

cmds/installd/commands.h→cmds/installd/InstalldNativeService.h

+8 −8

File changed and moved.

Contains only whitespace changes.

cmds/installd/binder/android/os/IInstalld.aidl

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ interface IInstalld { 
    void createUserData(@nullable @utf8InCpp String uuid, int userId, int userSerial, int flags);

    void destroyUserData(@nullable @utf8InCpp String uuid, int userId, int flags);



    void createAppData(in @nullable @utf8InCpp String uuid, in @utf8InCpp String packageName,

    void createAppData(@nullable @utf8InCpp String uuid, in @utf8InCpp String packageName,

            int userId, int flags, int appId, in @utf8InCpp String seInfo, int targetSdkVersion);

    void restoreconAppData(@nullable @utf8InCpp String uuid, @utf8InCpp String packageName,

            int userId, int flags, int appId, @utf8InCpp String seInfo);