diff options
| author |   Amith Yamasani <yamasani@google.com> | 2010-03-09 12:46:57 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2010-03-09 15:01:09 -0800 |
| commit | 07b1603a3f9611f6d15dd7fcedf883d6ef8e5817 (patch) | |
| tree | 3a88daaee27b886909a5af8a646b41dfb794a9f8 /Android.mk | |
| parent | 81c52293f84ce475ac6b1661f4a4b92703405247 (diff) | |
| download | latinime-07b1603a3f9611f6d15dd7fcedf883d6ef8e5817.tar.gz latinime-07b1603a3f9611f6d15dd7fcedf883d6ef8e5817.tar.xz latinime-07b1603a3f9611f6d15dd7fcedf883d6ef8e5817.zip | |
Don't let the native code target be included twice when unbundling.
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
Diffstat (limited to 'Android.mk')
| -rw-r--r--[-rwxr-xr-x] | Android.mk | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/Android.mk b/Android.mk index 5396ed518..8f1acc55a 100755..100644 --- a/Android.mk +++ b/Android.mk @@ -1,23 +1,17 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := LatinIME - -LOCAL_CERTIFICATE := shared - -LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime - -LOCAL_STATIC_JAVA_LIBRARIES := android-common - -#LOCAL_AAPT_FLAGS := -0 .dict - -LOCAL_SDK_VERSION := current - -LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags - -include $(BUILD_PACKAGE) -include $(LOCAL_PATH)/dictionary/Android.mk +# 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) + +include $(call all-makefiles-under,$(LOCAL_PATH)) |