diff options
author | Andreas Gampe <agampe@google.com> | 2018-05-15 20:39:37 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-15 20:39:37 -0700 |
commit | 486ecfedc8a054176ffc95db49d59b01115da202 (patch) | |
tree | 64ae29baf363a6c020f3756272b4a9060c145bf1 | |
parent | 74812032f8d8eddbef387f18c96de9e5c38b8fdb (diff) | |
parent | 667b8866dbf994510526326fc03cea14613a00b4 (diff) | |
download | jline-486ecfedc8a054176ffc95db49d59b01115da202.tar.gz |
Merge "JLine: convert to soong" am: abf7aa1401android-wear-8.0.0_r2android-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-r3android-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.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1oreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 667b8866db
Change-Id: Icc76adcf2c6a2f5f6d199f7343eb69c0bc84b3a8
-rw-r--r-- | Android.bp | 18 | ||||
-rw-r--r-- | Android.mk | 23 |
2 files changed, 18 insertions, 23 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7276cca --- /dev/null +++ b/Android.bp @@ -0,0 +1,18 @@ +// 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_import_host { + name: "jline-1.0", + jars: [ "jline-1.0.jar" ], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 6fa3e55..0000000 --- a/Android.mk +++ /dev/null @@ -1,23 +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_IS_HOST_MODULE := true -LOCAL_PREBUILT_JAVA_LIBRARIES := jline-1.0:jline-1.0.jar - -include $(BUILD_MULTI_PREBUILT) |