Merge "Convert Android.mk file to Android.bp" am: ef6c4ed5c8

am: 3c435fce84

Change-Id: Ief8992562565b7c5081f6d4a19a5d66d6796b77d

2 files changed, 18 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..8655d77
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2016 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: "universal-tween-engine",
+    srcs: ["java/api/src/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 135327b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2016 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_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, java/api/src)
-
-LOCAL_MODULE := universal-tween-engine
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file