Merge "Convert Android.mk file to Android.bp" am: f526e6009b am: eb886a265f
am: 81500dbffe

Change-Id: I91a0a9fecc1aa141d933cd38c868f8eb05180de6
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..c9249e0
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,21 @@
+// Copyright (C) 2012 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: "mp4parser",
+    sdk_version: "9",
+    srcs: ["isoparser/src/main/java/**/*.java"],
+    java_resource_dirs: ["isoparser/src/main/resources"],
+
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index cbb6f81..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2012 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 := mp4parser
-LOCAL_SDK_VERSION := 9
-LOCAL_SRC_FILES := $(call all-java-files-under, isoparser/src/main/java)
-LOCAL_JAVA_RESOURCE_DIRS := isoparser/src/main/resources
-
-include $(BUILD_STATIC_JAVA_LIBRARY)