Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I3dfa0d5353e23806c4f4ed9ee574fd0f24114f64
diff --git a/libandroid_net_lowpan/tests/Android.mk b/libandroid_net_lowpan/tests/Android.mk
index 0db6dea..82580a1 100644
--- a/libandroid_net_lowpan/tests/Android.mk
+++ b/libandroid_net_lowpan/tests/Android.mk
@@ -34,10 +34,6 @@
# This only works if the class name matches the file name and the directory structure
# matches the package.
local_classes := $(subst /,.,$(patsubst src/%.java,%,$(local_java_files)))
-# Utility variables to allow replacing a space with a comma
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
# Convert class name list to jacoco exclude list
# This appends a * to all classes and replace the space separators with commas.
# These patterns will match all classes in this module and their inner classes.
@@ -60,6 +56,7 @@
libbacktrace \
libbase \
libbinder \
+ libbinderthreadstate \
libc++ \
libcutils \
liblog \
@@ -67,7 +64,6 @@
libnativehelper \
libnetdaidl \
libui \
- libunwind \
libutils \
libvndksupport \
libcrypto \
