diff options
author | Colin Cross <ccross@android.com> | 2017-10-27 00:23:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-27 00:23:51 +0000 |
commit | cbfad5619138abefd2a304dd537cc4ed4ad2b7a1 (patch) | |
tree | 8a2b533ac8293f510189ee8184d023f73f03fb37 | |
parent | b9b84920ba47ddf7f15baa01c56b28e3d3f951ea (diff) | |
parent | 8d6d0f77cb2e7520f6650781c643dd4120c956e6 (diff) | |
download | jsilver-cbfad5619138abefd2a304dd537cc4ed4ad2b7a1.tar.gz |
Merge "Convert external/jsilver to Android.bp" am: d7fb8234af am: c1514dce6bandroid-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.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: 8d6d0f77cb
Change-Id: I6d7ac05028b87105ed703bea98d89bd471550fb2
-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) |