Snap for 4500033 from a99a8fa07431d36717fd252561e23ebc389ded18 to pi-release
Change-Id: I087af6b6ea15bd7026b2ecc526b61861792cf096
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..104331d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2011 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_host {
+ name: "antlr-runtime",
+ srcs: ["antlr-3.4/runtime/Java/src/main/java/**/*.java"],
+ //Remove DOTTreeGenerator.java, so that we don't have the StringTemplate library as a dependency
+ exclude_srcs: ["antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 15d72a1..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2011 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 := antlr-runtime
-#LOCAL_SDK_VERSION := 8
-LOCAL_SRC_FILES := $(call all-java-files-under, antlr-3.4/runtime/Java/src/main/java)
-#Remove DOTTreeGenerator.java, so that we don't have the StringTemplate library as a dependency
-LOCAL_SRC_FILES := $(filter-out antlr-3.4/runtime/Java/src/main/java/org/antlr/runtime/tree/DOTTreeGenerator.java, $(LOCAL_SRC_FILES))
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# Also build a host-side library
-# include $(CLEAR_VARS)
-#
-# LOCAL_SRC_FILES := $(call all-java-files-under, src)
-# LOCAL_MODULE := antlrlib
-#
-# include $(BUILD_HOST_JAVA_LIBRARY)
-
