diff options
author | Sasha Smundak <asmundak@google.com> | 2019-01-15 02:37:30 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-15 02:37:30 -0800 |
commit | c97c3d6bc1a5098f04be97f6c4fd6c611cebe82b (patch) | |
tree | 5b9ab3f02d73297c500224125f9cc44ffa60eec3 | |
parent | 54d48dd818878e131954c9bb444993bf946e5a87 (diff) | |
parent | a9fd4600f289a6e71cfc239520d1ec14befd6861 (diff) | |
download | rappor-c97c3d6bc1a5098f04be97f6c4fd6c611cebe82b.tar.gz |
Convert Android.mk file to Android.bp am: 44e54c2848 am: e3a5477217
am: a9fd4600f2
Change-Id: If4df64f104a7f54cf1ef78996acfe7e4131a4ec7
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | Android.mk | 25 |
2 files changed, 14 insertions, 25 deletions
@@ -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) |