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

Commit e43bc405 authored by Andy McFadden's avatar Andy McFadden Committed by Android Git Automerger
Browse files

am f68c825c: Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev 

* commit 'f68c825c':
  Show build config in dumpsys SurfaceFlinger
parents de64dc25 f68c825c

include/gui/GuiConfig.h

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

 * Copyright (C) 2012 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 ANDROID_GUI_CONFIG_H

#define ANDROID_GUI_CONFIG_H



#include <utils/String8.h>



namespace android {



// Append the libgui configuration details to configStr.

void appendGuiConfigString(String8& configStr);



}; // namespace android



#endif /*ANDROID_GUI_CONFIG_H*/

include/ui/UiConfig.h

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

 * Copyright (C) 2012 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 ANDROID_UI_CONFIG_H

#define ANDROID_UI_CONFIG_H



#include <utils/String8.h>



namespace android {



// Append the libui configuration details to configStr.

void appendUiConfigString(String8& configStr);



}; // namespace android



#endif /*ANDROID_UI_CONFIG_H*/

libs/gui/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ LOCAL_SRC_FILES:= \ 
	SurfaceComposerClient.cpp \

	DummyConsumer.cpp \

	CpuConsumer.cpp \

	BufferItemConsumer.cpp

	BufferItemConsumer.cpp \

	GuiConfig.cpp



LOCAL_SHARED_LIBRARIES := \

	libbinder \

libs/gui/GuiConfig.cpp

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

 * Copyright (C) 2012 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.

 */



#include <gui/GuiConfig.h>



namespace android {



void appendGuiConfigString(String8& configStr)

{

    static const char* config =

            " [libgui"

#ifdef USE_FENCE_SYNC

            " USE_FENCE_SYNC"

#endif

#ifdef USE_NATIVE_FENCE_SYNC

            " USE_NATIVE_FENCE_SYNC"

#endif

#ifdef ALLOW_DEQUEUE_CURRENT_BUFFER

            " ALLOW_DEQUEUE_CURRENT_BUFFER"

#endif

            "]";

    configStr.append(config);

}



}; // namespace android

libs/ui/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ LOCAL_SRC_FILES:= \ 
	GraphicBufferMapper.cpp \

	PixelFormat.cpp \

	Rect.cpp \

	Region.cpp

	Region.cpp \

	UiConfig.cpp



LOCAL_SHARED_LIBRARIES := \

	libcutils \