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

Commit 796ad96a authored by Haixia Shi's avatar Haixia Shi Committed by Android (Google) Code Review
Browse files

Merge "Fix build errors in test-resize."

parents 1034177f 8dfd1da5
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
	libcutils \
	libutils \
	libbinder \
	libui \
	libgui

+5 −6
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@

#include <utils/Log.h>

#include <android/native_window.h>

#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
#include <binder/IServiceManager.h>
@@ -27,8 +29,6 @@

using namespace android;

namespace android {

int main(int argc, char** argv)
{
    // set up the thread-pool
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
    android_memset16((uint16_t*)outBuffer.bits, 0xF800, bpr*outBuffer.height);
    surface->unlockAndPost();

    surface->lock(&outBuffer);
    surface->lock(&outBuffer, NULL);
    android_memset16((uint16_t*)outBuffer.bits, 0x07E0, bpr*outBuffer.height);
    surface->unlockAndPost();

@@ -61,7 +61,6 @@ int main(int argc, char** argv)
    surfaceControl->setSize(320, 240);
    SurfaceComposerClient::closeGlobalTransaction();

    
    IPCThreadState::self()->joinThreadPool();

    return 0;