aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-14 18:59:58 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-14 18:59:58 -0800
commit48749886ffc0c5cea6439d787c9ce730363f80fa (patch)
tree5a49bf1f2dc7017bded0a31658c22563ae37ea8b
parentc6783c32331b3fe78ffd5077e7f180995d0e268e (diff)
parent0acbaee329a166ccee23875b00e8dfa0800b3888 (diff)
downloadnanohttpd-48749886ffc0c5cea6439d787c9ce730363f80fa.tar.gz
Convert Android.mk file to Android.bp am: 34424f0c17 am: 06459d67bb
am: 0acbaee329 Change-Id: I460aed8f272fd6242d703802f31977dabd30d2df
-rw-r--r--Android.bp20
-rw-r--r--Android.mk26
2 files changed, 20 insertions, 26 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5ffcbc9
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,20 @@
+// This module target includes just the single core file: NanoHTTPD.java, which
+// is enough for HTTP 1.1 support and nothing else.
+// ============================================================================
+java_library {
+ name: "libnanohttpd",
+ srcs: ["core/src/main/**/*.java"],
+ sdk_version: "current",
+}
+
+// This module target includes SimpleWebServer that supports additional functionality
+// such as serving files from a specified location, resume of downloads, etc.
+// ============================================================================
+java_library {
+ name: "nanohttpd-webserver",
+ srcs: [
+ "core/src/main/**/*.java",
+ "webserver/src/main/**/*.java",
+ ],
+ sdk_version: "current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index f5bf86b..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# This module target includes just the single core file: NanoHTTPD.java, which
-# is enough for HTTP 1.1 support and nothing else.
-# ============================================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, core/src/main)
-LOCAL_MODULE := libnanohttpd
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# This module target includes SimpleWebServer that supports additional functionality
-# such as serving files from a specified location, resume of downloads, etc.
-# ============================================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, core/src/main) \
- $(call all-java-files-under, webserver/src/main)
-LOCAL_MODULE := nanohttpd-webserver
-LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY) \ No newline at end of file