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

Commit 1a13cc31 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Installd: Clean up installd" am: da86f5aa am: 3c845824 

am: 265dae94

Change-Id: I4e84e771681ac460001d6e1102d1435180df9968
parents 5bd5dd88 265dae94

cmds/installd/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ 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 InstalldNativeService.cpp globals.cpp utils.cpp dexopt.cpp binder/android/os/IInstalld.aidl

LOCAL_SRC_FILES := otapreopt.cpp globals.cpp utils.cpp dexopt.cpp

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libbinder \

    libcutils \

    liblog \

    liblogwrap \

cmds/installd/dexopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,7 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
            ALOGV("DexInv: --- END '%s' (success) ---\n", dex_path);

        } else {

            ALOGE("DexInv: --- END '%s' --- status=0x%04x, process failed\n", dex_path, res);

            return -1;

            return res;

        }

    }

cmds/installd/globals.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


#include <inttypes.h>



#include "InstalldNativeService.h"



namespace android {

namespace installd {

cmds/installd/otapreopt.cpp

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <log/log.h>

#include <private/android_filesystem_config.h>



#include "InstalldNativeService.h"

#include "dexopt.h"

#include "file_parsing.h"

#include "globals.h"