a3477c862a
BREAKING CHANGE: Redesigned the key character map format to accomodate full keyboards with more comprehensive suite of modifiers. Old key character maps will not work anymore and must be updated. The new format is plain text only and it not compiled to a binary file (so the "kcm" tool will be removed in a subsequent check-in). Added FULL keyboard type to support full PC-style keyboards. Added SPECIAL_FUNCTION keyboard type to support special function keypads that do not have any printable keys suitable for typing and only have keys like HOME and POWER Added a special VIRTUAL_KEYBOARD device id convention that maps to a virtual keyboard with a fixed known layout. This is designed to work around issues injecting input events on devices whose built-in keyboard does not have a useful key character map (ie. when the built-in keyboard is a special function keyboard only.) Modified several places where events were being synthesized to use the virtual keyboard. Removed support for the "qwerty" default layout. The new default layout is "Generic". For the most part "qwerty" was being used as a backstop in case the built-in keyboard did not have a key character map (probably because it was a special function keypad) and the framework needed to be able to inject key events anyways. The latter issue is resolved by using the special VIRTUAL_KEYBOARD device instead of BUILT_IN_KEYBOARD. Added the concept of a key modifier behavior so that MetaKeyKeyListener can distinguish between keyboards that use chorded vs. toggled modifiers. Wrote more robust key layout and key character map parsers to enable support for new keyboard features and user installable key maps. Fixed a bug in InputReader generating key ups when keys are released out of sequence. Updated tons of documentation. Currently QwertyKeyListener is being used for full keyboards with autotext and capitalization disabled. This mostly works but causes some problems with character pickers, etc. These issues will be resolved in subsequent changes. Change-Id: Ica48f6097a551141c215bc0d2c6f7b3fb634d354
138 lines
3.1 KiB
Makefile
138 lines
3.1 KiB
Makefile
# Copyright (C) 2008 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)
|
|
|
|
# libutils is a little unique: It's built twice, once for the host
|
|
# and once for the device.
|
|
|
|
commonSources:= \
|
|
Asset.cpp \
|
|
AssetDir.cpp \
|
|
AssetManager.cpp \
|
|
BufferedTextOutput.cpp \
|
|
CallStack.cpp \
|
|
Debug.cpp \
|
|
FileMap.cpp \
|
|
Flattenable.cpp \
|
|
ObbFile.cpp \
|
|
Pool.cpp \
|
|
RefBase.cpp \
|
|
ResourceTypes.cpp \
|
|
SharedBuffer.cpp \
|
|
Static.cpp \
|
|
StopWatch.cpp \
|
|
StreamingZipInflater.cpp \
|
|
String8.cpp \
|
|
String16.cpp \
|
|
StringArray.cpp \
|
|
SystemClock.cpp \
|
|
TextOutput.cpp \
|
|
Threads.cpp \
|
|
Timers.cpp \
|
|
Tokenizer.cpp \
|
|
Unicode.cpp \
|
|
VectorImpl.cpp \
|
|
ZipFileCRO.cpp \
|
|
ZipFileRO.cpp \
|
|
ZipUtils.cpp \
|
|
misc.cpp
|
|
|
|
|
|
# For the host
|
|
# =====================================================
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES:= $(commonSources)
|
|
|
|
LOCAL_MODULE:= libutils
|
|
|
|
LOCAL_CFLAGS += -DLIBUTILS_NATIVE=1 $(TOOL_CFLAGS)
|
|
LOCAL_C_INCLUDES += external/zlib
|
|
|
|
ifeq ($(HOST_OS),windows)
|
|
ifeq ($(strip $(USE_CYGWIN),),)
|
|
# Under MinGW, ctype.h doesn't need multi-byte support
|
|
LOCAL_CFLAGS += -DMB_CUR_MAX=1
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(HOST_OS),darwin)
|
|
# MacOS doesn't have lseek64. However, off_t is 64-bit anyway.
|
|
LOCAL_CFLAGS += -DOFF_T_IS_64_BIT
|
|
endif
|
|
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
|
|
|
|
# For the device
|
|
# =====================================================
|
|
include $(CLEAR_VARS)
|
|
|
|
|
|
# we have the common sources, plus some device-specific stuff
|
|
LOCAL_SRC_FILES:= \
|
|
$(commonSources) \
|
|
BackupData.cpp \
|
|
BackupHelpers.cpp \
|
|
Looper.cpp
|
|
|
|
ifeq ($(TARGET_OS),linux)
|
|
LOCAL_LDLIBS += -lrt -ldl
|
|
endif
|
|
|
|
LOCAL_C_INCLUDES += \
|
|
external/zlib \
|
|
external/icu4c/common
|
|
|
|
LOCAL_LDLIBS += -lpthread
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libz \
|
|
liblog \
|
|
libcutils
|
|
|
|
ifneq ($(TARGET_SIMULATOR),true)
|
|
ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)
|
|
# This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp
|
|
LOCAL_SHARED_LIBRARIES += libdl
|
|
endif # linux-x86
|
|
endif # sim
|
|
|
|
LOCAL_MODULE:= libutils
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
ifneq ($(TARGET_SIMULATOR),true)
|
|
ifeq ($(TARGET_OS),linux)
|
|
include $(CLEAR_VARS)
|
|
LOCAL_C_INCLUDES += external/zlib external/icu4c/common
|
|
LOCAL_LDLIBS := -lrt -ldl -lpthread
|
|
LOCAL_MODULE := libutils
|
|
LOCAL_SRC_FILES := $(commonSources) BackupData.cpp BackupHelpers.cpp
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
endif
|
|
endif
|
|
|
|
|
|
# Include subdirectory makefiles
|
|
# ============================================================
|
|
|
|
# If we're building with ONE_SHOT_MAKEFILE (mm, mmm), then what the framework
|
|
# team really wants is to build the stuff defined by this makefile.
|
|
ifeq (,$(ONE_SHOT_MAKEFILE))
|
|
include $(call first-makefiles-under,$(LOCAL_PATH))
|
|
endif
|