Snap for 4965753 from 411ebef7f603e7fb7d60e3f6cf243ec050e12e31 to sdk-release

Change-Id: I8cad85935e32aa6626ea9256f2e75503e7582883

2 files changed, 30 insertions, 35 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 00000000..acd6e402
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright (C) 2017 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 {
+    name: "slf4j-jdk14",
+    hostdex: true,
+    srcs: [
+        "slf4j-api/src/main/**/*.java",
+        "slf4j-jdk14/src/main/java/**/*.java",
+    ],
+    exclude_srcs: [
+        "slf4j-api/src/main/java/org/slf4j/impl/**/*.java",
+    ],
+
+    sdk_version: "core_current",
+}
+
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 860b7082..00000000
--- a/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2017 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)
-
-slf4j-common_src_files := $(call all-java-files-under,slf4j-api/src/main/java)
-slf4j-common_src_files := $(filter-out slf4j-api/src/main/java/org/slf4j/impl/%, $(slf4j-common_src_files))
-slf4j-jdk14_src_files := $(call all-java-files-under,slf4j-jdk14/src/main/java)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(slf4j-common_src_files) $(slf4j-jdk14_src_files)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := slf4j-jdk14
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_SDK_VERSION := core_current
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(slf4j-common_src_files) $(slf4j-jdk14_src_files)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := slf4j-jdk14-hostdex
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)