aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2017-10-31 14:30:15 +0000
committerRicky Wai <rickywai@google.com>2017-10-31 14:30:15 +0000
commit2415caae6626506afd541d1807e2ed1027d2d490 (patch)
tree06198a8c3437d2e13c94a31eb3652421191bc59a
parentb5c3d4d14f7373e0f9f7e6fc5329c41b89c892f3 (diff)
downloadrappor-2415caae6626506afd541d1807e2ed1027d2d490.tar.gz
Convert rappor target to Android.bp
Test: Build success Change-Id: Idd841811ad35c3ca3744dabfe68967ff1e9006e7
-rw-r--r--Android.bp26
-rw-r--r--Android.mk9
2 files changed, 26 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7cefad1
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,26 @@
+//
+// 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.
+//
+
+java_library_static {
+ name: "rappor",
+ no_framework_libs: true,
+ java_version: "1.7",
+ libs: [
+ "core-oj",
+ "jsr305",
+ ],
+ srcs: ["client/java/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
index 57589e0..948d2f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,15 +16,6 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := rappor
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-LOCAL_JAVA_LIBRARIES := core-oj jsr305
-LOCAL_SRC_FILES := $(call all-java-files-under, client/java)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-include $(CLEAR_VARS)
LOCAL_MODULE := rappor-tests
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LANGUAGE_VERSION := 1.7