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

Commit 08965ec6 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fixup hardcoded include paths for new project 

Change-Id: Id443ec5c99bb4d7653905f1be1f72a029e0cf087
parent 2d5ddd18

cmds/system_server/library/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -5,13 +5,14 @@ LOCAL_SRC_FILES:= \ 
	system_init.cpp



base = $(LOCAL_PATH)/../../..

native = $(LOCAL_PATH)/../../../../native



LOCAL_C_INCLUDES := \

	$(base)/services/camera/libcameraservice \

	$(base)/services/audioflinger \

	$(base)/services/surfaceflinger \

	$(base)/services/sensorservice \

	$(base)/media/libmediaplayerservice \

	$(native)/services/surfaceflinger \

	$(JNI_H_INCLUDE)



LOCAL_SHARED_LIBRARIES := \

core/jni/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -159,12 +159,10 @@ LOCAL_C_INCLUDES += \ 
	$(JNI_H_INCLUDE) \

	$(LOCAL_PATH)/android/graphics \

	$(LOCAL_PATH)/../../libs/hwui \

	$(LOCAL_PATH)/../../opengl/libs \

	$(LOCAL_PATH)/../../../native/opengl/libs \

	$(call include-path-for, bluedroid) \

	$(call include-path-for, libhardware)/hardware \

	$(call include-path-for, libhardware_legacy)/hardware_legacy \

	$(LOCAL_PATH)/../../include/ui \

	$(LOCAL_PATH)/../../include/utils \

	external/skia/include/core \

	external/skia/include/effects \

	external/skia/include/images \

libs/androidfw/tests/InputChannel_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <time.h>

#include <errno.h>



#include "../../utils/tests/TestHelpers.h"

#include "TestHelpers.h"



namespace android {

libs/androidfw/tests/InputPublisherAndConsumer_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <sys/mman.h>

#include <cutils/ashmem.h>



#include "../../utils/tests/TestHelpers.h"

#include "TestHelpers.h"



namespace android {

libs/androidfw/tests/TestHelpers.h

0 → 100644
+79 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef TESTHELPERS_H

#define TESTHELPERS_H



#include <utils/threads.h>



namespace android {



class Pipe {

public:

    int sendFd;

    int receiveFd;



    Pipe() {

        int fds[2];

        ::pipe(fds);



        receiveFd = fds[0];

        sendFd = fds[1];

    }



    ~Pipe() {

        if (sendFd != -1) {

            ::close(sendFd);

        }



        if (receiveFd != -1) {

            ::close(receiveFd);

        }

    }



    status_t writeSignal() {

        ssize_t nWritten = ::write(sendFd, "*", 1);

        return nWritten == 1 ? 0 : -errno;

    }



    status_t readSignal() {

        char buf[1];

        ssize_t nRead = ::read(receiveFd, buf, 1);

        return nRead == 1 ? 0 : nRead == 0 ? -EPIPE : -errno;

    }

};



class DelayedTask : public Thread {

    int mDelayMillis;



public:

    DelayedTask(int delayMillis) : mDelayMillis(delayMillis) { }



protected:

    virtual ~DelayedTask() { }



    virtual void doTask() = 0;



    virtual bool threadLoop() {

        usleep(mDelayMillis * 1000);

        doTask();

        return false;

    }

};



} // namespace android



#endif // TESTHELPERS_H