diff options
author | Colin Cross <ccross@android.com> | 2018-08-17 17:14:46 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 17:14:46 -0700 |
commit | b651a1c9a39342ca3810ff5575c2471714cc176c (patch) | |
tree | ac6f7b1c49adc54092bcd2a3f4f0394a6bb071f8 | |
parent | 990fcb1a6dbb5d1204cc8ec86e4bc3f691f4aeeb (diff) | |
parent | eb0512fd1529c66c041c4e3223491d5cd20863f2 (diff) | |
download | inputmethodcommon-f5ed6628208fb4dab07a18a1f8dfa4d7980af7ad.tar.gz |
Merge "Convert frameworks/opt/inputmethodcommon to Android.bp"android-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-release
am: eb0512fd15
Change-Id: I7d0923e5d3eef45677eb1cc0c5a141146ead7ea2
-rw-r--r-- | Android.bp | 19 | ||||
-rw-r--r-- | Android.mk | 25 |
2 files changed, 19 insertions, 25 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..dc0f9cd --- /dev/null +++ b/Android.bp @@ -0,0 +1,19 @@ +// 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. + +java_library { + name: "inputmethod-common", + sdk_version: "14", + srcs: ["java/**/*.java"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index d8ed7c4..0000000 --- a/Android.mk +++ /dev/null @@ -1,25 +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 := inputmethod-common -LOCAL_SDK_VERSION := 14 -LOCAL_SRC_FILES := \ - $(call all-java-files-under, java) -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Build the test package -include $(call all-makefiles-under, $(LOCAL_PATH)) |