From c1a05d95922b359a06dd65e1ee2001d5cba932d8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 5 Sep 2017 17:17:47 -0700 Subject: Convert jsr305 to Android.bp See build/soong/README.md for more information. Test: m checkbuild Change-Id: I4456f7dcc049c8334a5ab44ada5caa8804ae7c9a --- Android.bp | 27 +++++++++++++++++++++++++++ Android.mk | 34 ---------------------------------- 2 files changed, 27 insertions(+), 34 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..e6d95a3 --- /dev/null +++ b/Android.bp @@ -0,0 +1,27 @@ +// 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_static { + name: "jsr305", + host_supported: true, + hostdex: true, + sdk_version: "8", + srcs: ["ri/src/main/java/**/*.java"], +} + +// Compatibility name +java_library_host { + name: "jsr305lib", + static_libs: ["jsr305"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 315bd73..0000000 --- a/Android.mk +++ /dev/null @@ -1,34 +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) - -# Target library. -include $(CLEAR_VARS) -LOCAL_MODULE := jsr305 -LOCAL_SDK_VERSION := 8 -LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Also build a host side library (Java) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) -LOCAL_MODULE := jsr305lib -include $(BUILD_HOST_JAVA_LIBRARY) - -# Also build a host side library (Dalvik) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, ri/src/main/java) -LOCAL_MODULE := jsr305-hostdex -include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) -- cgit v1.2.3