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

Commit 44a2a171 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Port Emulator keymaps."

parents d42da83f d5fdf7d7

libs/ui/Android.mk

+39 −4
Original line number Original line 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.



LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)



# libui is partially built for the host (used by build time keymap validation tool)

# These files are common to host and target builds.

commonSources:= \

	Input.cpp \

	Keyboard.cpp \

	KeyLayoutMap.cpp \

	KeyCharacterMap.cpp \



# For the host

# =====================================================



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= $(commonSources)



LOCAL_MODULE:= libui



include $(BUILD_HOST_STATIC_LIBRARY)





# For the device

# =====================================================



include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

	$(commonSources) \

	EGLUtils.cpp \

	EGLUtils.cpp \

	EventHub.cpp \

	EventHub.cpp \

	EventRecurrence.cpp \

	EventRecurrence.cpp \
@@ -10,10 +49,6 @@ LOCAL_SRC_FILES:= \ 
	GraphicBufferAllocator.cpp \

	GraphicBufferAllocator.cpp \

	GraphicBufferMapper.cpp \

	GraphicBufferMapper.cpp \

	GraphicLog.cpp \

	GraphicLog.cpp \

	Keyboard.cpp \

	KeyLayoutMap.cpp \

	KeyCharacterMap.cpp \

	Input.cpp \

	InputDispatcher.cpp \

	InputDispatcher.cpp \

	InputManager.cpp \

	InputManager.cpp \

	InputReader.cpp \

	InputReader.cpp \

libs/ui/KeyCharacterMap.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -733,6 +733,7 @@ status_t KeyCharacterMap::Parser::parseModifier(const String8& token, int32_t* o 
            }

            }





            combinedMeta |= metaState;

            combinedMeta |= metaState;

            start = cur + 1;





            if (ch == '\0') {

            if (ch == '\0') {

                break;

                break;