nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile and source code structure update for LatinIME AOSP build 

Change-Id: Ia2ab54651ef96521fce01fe4755147909b818803
main
Ken Wakasa 2012-06-30 08:53:33 +09:00
parent 26c45718a5
commit 8658e552f3
15 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
native/jni/Android.mk
View File

@ -50,11 +50,18 @@ LATIN_IME_CORE_SRC_FILES := \
proximity_info.cpp \
proximity_info_state.cpp \
unigram_dictionary.cpp \
gesture/build_check.cpp
gesture/incremental_decoder_interface.cpp
LATIN_IME_GESTURE_IMPL_SRC_FILES := \
gesture/impl/gesture_decoder_impl.cpp \
gesture/impl/incremental_decoder_impl.cpp \
gesture/impl/token_beam_impl.cpp \
gesture/impl/token_impl.cpp
LOCAL_SRC_FILES := \
$(LATIN_IME_JNI_SRC_FILES) \
$(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES))
$(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES)) \
$(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_GESTURE_IMPL_SRC_FILES))
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
@ -79,21 +86,16 @@ include $(BUILD_STATIC_LIBRARY)
######################################
include $(CLEAR_VARS)
LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) \
$(addprefix $(LATIN_IME_SRC_FULLPATH_DIR)/, gesture gesture/impl gesture/impl/header)
LOCAL_C_INCLUDES = $(LATIN_IME_SRC_FULLPATH_DIR) $(LATIN_IME_SRC_FULLPATH_DIR)/gesture
LOCAL_CFLAGS += -Werror -Wall
# To suppress compiler warnings for unused variables/functions used for debug features etc.
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LATIN_IME_GESTURE_IMPL_SRC_FILES := \
gesture/impl/gesture_decoder_impl.cpp \
gesture/impl/incremental_decoder_impl.cpp \
gesture/impl/token_beam_impl.cpp \
gesture/impl/token_impl.cpp
LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_GESTURE_IMPL_SRC_FILES))
LOCAL_SRC_FILES := \
$(LATIN_IME_JNI_SRC_FILES) \
$(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES))
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
@ -105,7 +107,7 @@ ifeq ($(FLAG_DBG), true)
endif # FLAG_DBG
endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_gesture_impl_static
LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
@ -119,7 +121,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_static libjni_latinime_gesture_impl_static
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_static
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
LOCAL_SHARED_LIBRARIES := libstlport

5
native/jni/src/dictionary.cpp
View File

@ -22,6 +22,7 @@
#include "binary_format.h"
#include "defines.h"
#include "dictionary.h"
#include "incremental_decoder_interface.h"
namespace latinime {
@ -43,7 +44,8 @@ Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust,
mUnigramDictionary = new UnigramDictionary(mDict + headerSize, typedLetterMultiplier,
fullWordMultiplier, maxWordLength, maxWords, options);
mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength);
mGestureDecoder = new GestureDecoder(maxWordLength, maxWords);
mGestureDecoder = IncrementalDecoderInterface::getGestureDecoderInstance(maxWordLength,
maxWords);
mGestureDecoder->setDict(mUnigramDictionary, mBigramDictionary,
mDict + headerSize /* dict root */, 0 /* root pos */);
}
@ -51,6 +53,7 @@ Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust,
Dictionary::~Dictionary() {
delete mUnigramDictionary;
delete mBigramDictionary;
delete mGestureDecoder;
}
int Dictionary::getFrequency(const int32_t *word, int length) const {

4
native/jni/src/dictionary.h
View File

@ -22,7 +22,7 @@
#include "bigram_dictionary.h"
#include "char_utils.h"
#include "defines.h"
#include "gesture/gesture_decoder.h"
#include "incremental_decoder_interface.h"
#include "proximity_info.h"
#include "unigram_dictionary.h"
#include "words_priority_queue_pool.h"
@ -87,7 +87,7 @@ class Dictionary {
const UnigramDictionary *mUnigramDictionary;
const BigramDictionary *mBigramDictionary;
GestureDecoder *mGestureDecoder;
IncrementalDecoderInterface *mGestureDecoder;
};
// public static utility methods

37
native/jni/src/gesture/gesture_decoder.h
View File

@ -1,37 +0,0 @@
/*
* 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 LATINIME_GESTURE_DECODER_H
#define LATINIME_GESTURE_DECODER_H
#include "defines.h"
#include "gesture_decoder_impl.h"
namespace latinime {
class GestureDecoder : public GestureDecoderImpl {
public:
GestureDecoder(int maxWordLength, int maxWords) :
GestureDecoderImpl(maxWordLength, maxWords) {
}
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(GestureDecoder);
};
} // namespace latinime
#endif // LATINIME_INCREMENTAL_DECODER_H

21
native/jni/src/gesture/impl/gesture_decoder_impl.cpp
View File

@ -15,7 +15,26 @@
*/
#include "gesture_decoder_impl.h"
#include "incremental_decoder_interface.h"
namespace latinime {
// A factory method for GestureDecoderImpl
static IncrementalDecoderInterface *getDecoderInstance(int maxWordLength, int maxWords) {
return new GestureDecoderImpl(maxWordLength, maxWords);
}
// An ad-hoc internal class to register the factory method defined above
class GestureDecoderFactoryRegisterer {
public:
GestureDecoderFactoryRegisterer() {
IncrementalDecoderInterface::setGestureDecoderFactoryMethod(getDecoderInstance);
}
private:
DISALLOW_COPY_AND_ASSIGN(GestureDecoderFactoryRegisterer);
};
// namespace latinime
// To invoke the GestureDecoderFactoryRegisterer constructor in the global constructor
// Not sure, but can be static?
GestureDecoderFactoryRegisterer gestureDecoderFactoryRegisterer;
} // namespace latinime

8
native/jni/src/gesture/impl/gesture_decoder_impl.h
View File

@ -18,15 +18,14 @@
#define LATINIME_GESTURE_DECODER_IMPL_H
#include "defines.h"
#include "incremental_decoder.h"
#include "incremental_decoder_impl.h"
namespace latinime {
class GestureDecoderImpl : public IncrementalDecoder {
class GestureDecoderImpl : public IncrementalDecoderImpl {
public:
GestureDecoderImpl(int maxWordLength, int maxWords) :
IncrementalDecoder(maxWordLength, maxWords) {
IncrementalDecoderImpl(maxWordLength, maxWords) {
}
int getSuggestions(ProximityInfo *pInfo, int *inputXs, int *inputYs, int *times,
@ -39,5 +38,4 @@ class GestureDecoderImpl : public IncrementalDecoder {
DISALLOW_IMPLICIT_CONSTRUCTORS(GestureDecoderImpl);
};
} // namespace latinime
#endif // LATINIME_GESTURE_DECODER_IMPL_H

21
native/jni/src/gesture/impl/incremental_decoder_impl.cpp
View File

@ -15,7 +15,26 @@
*/
#include "incremental_decoder_impl.h"
#include "incremental_decoder_interface.h"
namespace latinime {
// A factory method for IncrementalDecoderImpl
static IncrementalDecoderInterface *getDecoderInstance(int maxWordLength, int maxWords) {
return new IncrementalDecoderImpl(maxWordLength, maxWords);
}
// An ad-hoc internal class to register the factory method defined above
class IncrementalDecoderFactoryRegisterer {
public:
IncrementalDecoderFactoryRegisterer() {
IncrementalDecoderInterface::setIncrementalDecoderFactoryMethod(getDecoderInstance);
}
private:
DISALLOW_COPY_AND_ASSIGN(IncrementalDecoderFactoryRegisterer);
};
// namespace latinime
// To invoke the IncrementalDecoderFactoryRegisterer constructor in the global constructor
// Not sure, but can be static?
IncrementalDecoderFactoryRegisterer incrementalDecoderFactoryRegisterer;
} // namespace latinime

23
native/jni/src/gesture/impl/incremental_decoder_impl.h
View File

@ -17,25 +17,30 @@
#ifndef LATINIME_INCREMENTAL_DECODER_IMPL_H
#define LATINIME_INCREMENTAL_DECODER_IMPL_H
#include "bigram_dictionary.h"
#include "defines.h"
#include "incremental_decoder_interface.h"
#include "unigram_dictionary.h"
namespace latinime {
class IncrementalDecoderImpl : IncrementalDecoderInterface {
class UnigramDictionary;
class BigramDictionary;
class IncrementalDecoderImpl : public IncrementalDecoderInterface {
public:
IncrementalDecoderImpl(int maxWordLength, int maxWords) { };
void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram,
const uint8_t *dictRoot, int rootPos) { };
void setPrevWord(const int32_t *prevWord, int prevWordLength) { };
void reset() { };
IncrementalDecoderImpl(int maxWordLength, int maxWords) { };
void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram,
const uint8_t *dictRoot, int rootPos) { };
void setPrevWord(const int32_t *prevWord, int prevWordLength) { };
void reset() { };
int getSuggestions(ProximityInfo *pInfo, int *inputXs, int *inputYs, int *times,
int *pointerIds, int *codes, int inputSize, int commitPoint,
unsigned short *outWords, int *frequencies, int *outputIndices) {
return 0;
}
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalDecoderImpl);
};
} // namespace latinime
#endif // LATINIME_INCREMENTAL_DECODER_IMPL_H

3
native/jni/src/gesture/impl/token_beam_impl.cpp
View File

@ -17,5 +17,4 @@
#include "token_beam_impl.h"
namespace latinime {
};
// namespace latinime
} // namespace latinime

1
native/jni/src/gesture/impl/token_beam_impl.h
View File

@ -26,5 +26,4 @@ class TokenBeamImpl {
DISALLOW_IMPLICIT_CONSTRUCTORS(TokenBeamImpl);
};
} // namespace latinime
#endif // LATINIME_TOKEN_BEAM_IMPL_H

3
native/jni/src/gesture/impl/token_impl.cpp
View File

@ -17,5 +17,4 @@
#include "token_impl.h"
namespace latinime {
};
// namespace latinime
} // namespace latinime

1
native/jni/src/gesture/impl/token_impl.h
View File

@ -26,5 +26,4 @@ struct TokenImpl {
DISALLOW_IMPLICIT_CONSTRUCTORS(TokenImpl);
};
} // namespace latinime
#endif // LATINIME_TOKEN_IMPL_H

37
native/jni/src/gesture/incremental_decoder.h
View File

@ -1,37 +0,0 @@
/*
* 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 LATINIME_INCREMENTAL_DECODER_H
#define LATINIME_INCREMENTAL_DECODER_H
#include "defines.h"
#include "incremental_decoder_impl.h"
namespace latinime {
class IncrementalDecoder : public IncrementalDecoderImpl {
public:
IncrementalDecoder(int maxWordLength, int maxWords) :
IncrementalDecoderImpl(maxWordLength, maxWords) {
}
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(IncrementalDecoder);
};
} // namespace latinime
#endif // LATINIME_INCREMENTAL_DECODER_H

9
native/jni/src/gesture/build_check.cpp → native/jni/src/gesture/incremental_decoder_interface.cpp
View File

@ -14,8 +14,11 @@
* limitations under the License.
*/
#include "gesture_decoder.h"
#include "incremental_decoder_interface.h"
namespace latinime {
};
// namespace latinime
IncrementalDecoderInterface *
(*IncrementalDecoderInterface::sGestureDecoderFactoryMethod)(int, int) = 0;
IncrementalDecoderInterface *
(*IncrementalDecoderInterface::sIncrementalDecoderFactoryMethod)(int, int) = 0;
} // namespace latinime

39
native/jni/src/gesture/incremental_decoder_interface.h
View File

@ -17,15 +17,16 @@
#ifndef LATINIME_INCREMENTAL_DECODER_INTERFACE_H
#define LATINIME_INCREMENTAL_DECODER_INTERFACE_H
#include "bigram_dictionary.h"
#include <stdint.h>
#include "defines.h"
#include "proximity_info.h"
#include "unigram_dictionary.h"
namespace latinime {
class IncrementalDecoderInterface {
class UnigramDictionary;
class BigramDictionary;
class ProximityInfo;
class IncrementalDecoderInterface {
public:
virtual int getSuggestions(ProximityInfo *pInfo, int *inputXs, int *inputYs, int *times,
int *pointerIds, int *codes, int inputSize, int commitPoint,
@ -35,7 +36,35 @@ class IncrementalDecoderInterface {
const uint8_t *dictRoot, int rootPos) = 0;
virtual void setPrevWord(const int32_t *prevWord, int prevWordLength) = 0;
virtual ~IncrementalDecoderInterface() { };
static IncrementalDecoderInterface *getGestureDecoderInstance(int maxWordLength, int maxWords) {
if (sGestureDecoderFactoryMethod) {
return sGestureDecoderFactoryMethod(maxWordLength, maxWords);
}
return 0;
}
static IncrementalDecoderInterface *getIncrementalDecoderInstance(int maxWordLength,
int maxWords) {
if (sIncrementalDecoderFactoryMethod) {
return sIncrementalDecoderFactoryMethod(maxWordLength, maxWords);
}
return 0;
}
static void setGestureDecoderFactoryMethod(
IncrementalDecoderInterface *(*factoryMethod)(int, int)) {
sGestureDecoderFactoryMethod = factoryMethod;
}
static void setIncrementalDecoderFactoryMethod(
IncrementalDecoderInterface *(*factoryMethod)(int, int)) {
sIncrementalDecoderFactoryMethod = factoryMethod;
}
private:
static IncrementalDecoderInterface *(*sGestureDecoderFactoryMethod)(int, int);
static IncrementalDecoderInterface *(*sIncrementalDecoderFactoryMethod)(int, int);
};
} // namespace latinime
#endif // LATINIME_INCREMENTAL_DECODER_INTERFACE_H