Merge "Convert frameworks/opt/timezonepicker to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..24cb8c3
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2013 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.
+
+android_library {
+    name: "android-opt-timezonepicker",
+    sdk_version: "17",
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.logtags",
+    ],
+
+    resource_dirs: ["res"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a35f0ec..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2013 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 := android-opt-timezonepicker
-
-LOCAL_SDK_VERSION := 17
-
-LOCAL_SRC_FILES := \
-     $(call all-java-files-under, src) \
-     $(call all-logtags-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/assets/backward b/assets/backward
deleted file mode 120000
index 70086b0..0000000
--- a/assets/backward
+++ /dev/null
@@ -1 +0,0 @@
-../../../../external/timezonepicker-support/backward
\ No newline at end of file
diff --git a/assets/zone.tab b/assets/zone.tab
deleted file mode 120000
index 46c2d66..0000000
--- a/assets/zone.tab
+++ /dev/null
@@ -1 +0,0 @@
-../../../../external/timezonepicker-support/zone.tab
\ No newline at end of file