aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-03-25 11:09:30 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-25 11:09:30 -0700
commit0eb0290dd7569738c8661da16d4f7e24679d5394 (patch)
tree6a63ce530fc4e426f5fa711c2772774ded0884bf
parent824777c817ddcc99a6b37ca430a7d01ae544251d (diff)
parentc41f060be6f94fb39981ef15343b17f3b3936299 (diff)
downloadflatbuffers-0eb0290dd7569738c8661da16d4f7e24679d5394.tar.gz
Convert external/flatbuffer to Android.bp
am: c41f060be6 Change-Id: I08018189bee7d9225d27689a771d729881a2e66e
-rw-r--r--Android.bp8
-rw-r--r--Android.mk25
2 files changed, 9 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp
index ff4a55cb..ca938d1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,3 +62,11 @@ cc_binary_host {
"grpc/src/compiler/java_generator.cc",
],
}
+
+java_library {
+ name: "flatbuffers-java",
+ srcs: ["java/**/*.java"],
+ sdk_version: "current",
+
+ java_version: "1.8",
+}
diff --git a/Android.mk b/Android.mk
index 2cebceea..6e3fa354 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,24 +1 @@
-# 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 := flatbuffers-java
-LOCAL_SRC_FILES := $(call all-java-files-under, java)
-LOCAL_SDK_VERSION := current
-
-LOCAL_JAR_EXCLUDE_FILES := none
-LOCAL_JAVA_LANGUAGE_VERSION := 1.8
-include $(BUILD_STATIC_JAVA_LIBRARY)
+# Empty Android.mk to shadow android/jni/Android.mk and samples/android/jni/Android.mk