aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-10-24 17:44:49 -0700
committerDan Willemsen <dwillemsen@google.com>2018-10-31 21:49:02 -0700
commit22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3 (patch)
treeadc4a79776149ae2bc43f8c34e675643bb253141 /java
parentb6301306fa75dc4c7c4aba19d23ddb900082d1b3 (diff)
downloadlatinime-22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3.tar.gz
latinime-22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3.tar.xz
latinime-22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3.zip
Convert to Android.bp
See build/soong/README.md for more information. Test: cd packages/inputmethods/LatinIME; mma Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Diffstat (limited to 'java')
-rw-r--r--java/Android.bp44
-rw-r--r--java/Android.mk50
-rw-r--r--java/AndroidManifest_SdkVersion.xml20
3 files changed, 44 insertions, 70 deletions
diff --git a/java/Android.bp b/java/Android.bp
new file mode 100644
index 000000000..fbf27ceb0
--- /dev/null
+++ b/java/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2011 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.
+
+android_app {
+ name: "LatinIME",
+
+ srcs: ["src/**/*.java"],
+
+ certificate: "shared",
+
+ jni_libs: ["libjni_latinime"],
+
+ static_libs: [
+ "android-common",
+ "jsr305",
+ "latinime-common",
+ "androidx.legacy_legacy-support-v4",
+ ],
+
+ // Do not compress dictionary files to mmap dict data runtime
+ aaptflags: ["-0 .dict"],
+
+ // Include all the resources regardless of system supported locales
+ aapt_include_all_resources: true,
+
+ min_sdk_version: "14",
+ target_sdk_version: "23",
+ sdk_version: "current",
+
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+}
diff --git a/java/Android.mk b/java/Android.mk
deleted file mode 100644
index 875aad4f9..000000000
--- a/java/Android.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 2011 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 $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := LatinIME
-
-LOCAL_CERTIFICATE := shared
-
-LOCAL_FULL_LIBS_MANIFEST_FILES := \
- $(LOCAL_PATH)/AndroidManifest.xml \
- $(LOCAL_PATH)/AndroidManifest_SdkVersion.xml
-
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-common jsr305 latinime-common
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.legacy_legacy-support-v4
-
-LOCAL_USE_AAPT2 := true
-
-# Do not compress dictionary files to mmap dict data runtime
-LOCAL_AAPT_FLAGS := -0 .dict
-
-# Include all the resources regardless of system supported locales
-LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
diff --git a/java/AndroidManifest_SdkVersion.xml b/java/AndroidManifest_SdkVersion.xml
deleted file mode 100644
index 3dfeede86..000000000
--- a/java/AndroidManifest_SdkVersion.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.inputmethod.latin">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
-</manifest>