diff options
author | Sasha Smundak <asmundak@google.com> | 2019-01-14 23:17:18 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-14 23:17:18 -0800 |
commit | 89eebf20cca033debe66193577d037492c499532 (patch) | |
tree | 0ecb1830f21e80c88b2a76b9abb56fd32f7a71a3 | |
parent | 277ae9957c56615462cde7979c92a721f2663f3f (diff) | |
parent | 35a7baea1f3a47dca909fb1d37e0ada747f18132 (diff) | |
download | androidplot-89eebf20cca033debe66193577d037492c499532.tar.gz |
Convert Android.mk file to Android.bp
am: 35a7baea1f
Change-Id: Ic242cb36d87b6167f710237732b91cd1928dbc89
-rw-r--r-- | Android.bp | 41 | ||||
-rw-r--r-- | Android.mk | 49 |
2 files changed, 41 insertions, 49 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..4f48ead --- /dev/null +++ b/Android.bp @@ -0,0 +1,41 @@ +// Copyright (C) 2014 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. + +// Core androidplot library + +java_library { + name: "androidplot", + sdk_version: "current", + srcs: ["AndroidPlot-Core/src/main/**/*.java"], + // b/73499927 + errorprone: { + javacflags: ["-Xep:MissingOverride:OFF"], + }, +} + +// Demo app +android_test { + name: "AndroidPlotDemos", + sdk_version: "current", + static_libs: ["androidplot"], + resource_dirs: ["Examples/DemoApp/res"], + manifest: "Examples/DemoApp/AndroidManifest.xml", + srcs: ["Examples/DemoApp/src/**/*.java"], + + // b/73499927 + errorprone: { + javacflags: ["-Xep:MissingOverride:OFF"], + }, + +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 964d408..0000000 --- a/Android.mk +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2014 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) - -## Core androidplot library - -include $(CLEAR_VARS) - -LOCAL_MODULE := androidplot -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := $(call all-java-files-under, AndroidPlot-Core/src/main) - -# b/73499927 -LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF - -include ${BUILD_STATIC_JAVA_LIBRARY} - -## Demo app - -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := AndroidPlotDemos -LOCAL_MODULE_TAGS := tests -LOCAL_SDK_VERSION := current - -LOCAL_STATIC_JAVA_LIBRARIES := androidplot - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/Examples/DemoApp/res -LOCAL_MANIFEST_FILE := Examples/DemoApp/AndroidManifest.xml -LOCAL_SRC_FILES := $(call all-java-files-under, Examples/DemoApp/src) - -# b/73499927 -LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF - -include $(BUILD_PACKAGE) |