diff options
author | Colin Cross <ccross@android.com> | 2017-10-27 00:11:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-27 00:11:40 +0000 |
commit | c1514dce6b718b3c2c97da89d727ba06f88ad2d6 (patch) | |
tree | 8a2b533ac8293f510189ee8184d023f73f03fb37 | |
parent | b9b84920ba47ddf7f15baa01c56b28e3d3f951ea (diff) | |
parent | d7fb8234af900d1f3d5d1649fecfacaa9b802b01 (diff) | |
download | jsilver-c1514dce6b718b3c2c97da89d727ba06f88ad2d6.tar.gz |
Merge "Convert external/jsilver to Android.bp"android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
am: d7fb8234af
Change-Id: I493f2fd13a718bb74a1cc3b442dfba3ecee02479
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | Android.mk | 27 |
2 files changed, 20 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..169767d --- /dev/null +++ b/Android.bp @@ -0,0 +1,20 @@ +// 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. + +java_library_host { + name: "jsilver", + srcs: ["src/**/*.java"], + libs: ["guava"], + java_resource_dirs: ["src"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index ce1ab5c..0000000 --- a/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -# 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 $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_MODULE := jsilver - -LOCAL_JAVA_LIBRARIES := guavalib -LOCAL_JAVA_RESOURCE_DIRS := src - -include $(BUILD_HOST_JAVA_LIBRARY) |