Merge "Support for android.net.lowpan and LoWPAN Service"
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 45213bb..728a309 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -86,6 +86,7 @@
telecomm \
telephony \
wifi \
+ lowpan \
keystore \
rs \
)
diff --git a/target/product/base.mk b/target/product/base.mk
index ad4c133..e7d7859 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -111,6 +111,7 @@
mediaserver \
mediametrics \
mediaextractor \
+ lowpan_cmd \
monkey \
mtpd \
ndc \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 5a18c70..5aa4d34 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -88,6 +88,7 @@
voip-common \
webview \
webview_zygote \
+ lowpan-service \
wifi-service
PRODUCT_COPY_FILES += \
@@ -120,6 +121,7 @@
PRODUCT_SYSTEM_SERVER_JARS := \
services \
ethernet-service \
+ lowpan-service \
wifi-service
# The set of packages whose code can be loaded by the system server.
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 7bf16f5..5da6286 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -83,6 +83,7 @@
telephony-common \
voip-common \
logd \
+ lowpan-service \
wifi-service
# The order matters
@@ -107,6 +108,7 @@
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \
services \
+ lowpan-service \
wifi-service
# The set of packages whose code can be loaded by the system server.