[automerger skipped] Import translations. DO NOT MERGE
am: 90b3dabe5c -s ours
am skip reason: subject contains skip directive
Change-Id: I43828b21453537b2f568b25be3684608922b9786
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5217736
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,6 @@
+android_app {
+ name: "Gallery",
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ certificate: "media",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a5e3938..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Gallery
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := media
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..fe9f33f
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# This project has no significant updates recently.
+# Please update this list if you find better candidates.
+rtenneti@google.com
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..e5879ac
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,13 @@
+android_test {
+ name: "GalleryTests",
+ certificate: "media",
+ libs: [
+ "android.test.runner",
+ "android.test.base",
+ ],
+ static_libs: ["junit"],
+ // Include all test java files.
+ srcs: ["src/**/*.java"],
+ platform_apis: true,
+ instrumentation_for: "Gallery",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index b71ee90..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := media
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_STATIC_JAVA_LIBRARIES := junit
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := GalleryTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := Gallery
-
-include $(BUILD_PACKAGE)
-
-
