Convert Android.mk file to Android.bpandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1

See build/soong/README.md for more information.

Change-Id: I408a5b879d3f25be8851a9ad2a21d01732fbeb69
Fixes: 122332891
Test: treehugger

2 files changed, 14 insertions, 25 deletions

diff --git a/Android.bp b/Android.bp
index e98e467..fcae131 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,3 +23,17 @@ java_library {
     ],
     srcs: ["client/java/**/*.java"],
 }
+
+java_library {
+    name: "rappor-tests",
+    java_version: "1.7",
+    static_libs: [
+        "hamcrest-library",
+        "rappor",
+        "guava",
+        "junit",
+    ],
+    libs: ["jsr305"],
+    sdk_version: "core_current",
+    srcs: ["client/javatest/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1fb2caf..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2017 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 := rappor-tests
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-library rappor guava junit
-LOCAL_JAVA_LIBRARIES := jsr305
-LOCAL_SDK_VERISON := core_current
-LOCAL_SRC_FILES := $(call all-java-files-under, client/javatest)
-include $(BUILD_STATIC_JAVA_LIBRARY)