commit c0ba83e30a2082c65447544be6cff7d5df9e3a44
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Sep 01 00:08:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 00:08:22 2016 +0000
tree 602b8de8db8cc0b27582021baa31b037d826e2ce
parent 989087535a53d29d002db134cc28bbc53b482297
parent 7ab75a73250d1a8b1be841cd5c6548c679cd6a1c

Merge "Updated makefiles (includes java-library rules for applicable packages)."

tests/bar/1.0/Android.mk

diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk
index 1bd500b..b6e3cc8 100644
--- a/tests/bar/1.0/Android.mk
+++ b/tests/bar/1.0/Android.mk
@@ -33,6 +33,4 @@
   android.hardware.tests.foo@1.0 \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)

tests/baz/1.0/Android.mk

diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk
index dc25f6a..4aaade8 100644
--- a/tests/baz/1.0/Android.mk
+++ b/tests/baz/1.0/Android.mk
@@ -66,8 +66,6 @@
   libutils \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ################################################################################

tests/expression/1.0/Android.mk

diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk
index 5b713e4..137aaf8 100644
--- a/tests/expression/1.0/Android.mk
+++ b/tests/expression/1.0/Android.mk
@@ -32,8 +32,6 @@
   libutils \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ################################################################################

tests/foo/1.0/Android.mk

diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk
index 6f302e7..14b10c3 100644
--- a/tests/foo/1.0/Android.mk
+++ b/tests/foo/1.0/Android.mk
@@ -66,6 +66,4 @@
   libutils \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)

tests/libhwbinder/1.0/Android.mk

diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk
index b065e8d..079f484 100644
--- a/tests/libhwbinder/1.0/Android.mk
+++ b/tests/libhwbinder/1.0/Android.mk
@@ -32,8 +32,6 @@
   libutils \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)
 
 ################################################################################

tests/libhwbinder/aidl/Android.mk

diff --git a/tests/libhwbinder/aidl/Android.mk b/tests/libhwbinder/aidl/Android.mk
index b96e947..ea25e80 100644
--- a/tests/libhwbinder/aidl/Android.mk
+++ b/tests/libhwbinder/aidl/Android.mk
@@ -12,6 +12,4 @@
 
 LOCAL_STATIC_LIBRARIES := libtestUtil
 
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)

tests/msgq/1.0/Android.mk

diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk
index ed5bf14..c5b6c46 100644
--- a/tests/msgq/1.0/Android.mk
+++ b/tests/msgq/1.0/Android.mk
@@ -32,6 +32,4 @@
   libutils \
 
 LOCAL_MULTILIB := both
-LOCAL_COMPATIBILITY_SUITE := vts
--include test/vts/tools/build/Android.packaging_sharedlib.mk
 include $(BUILD_SHARED_LIBRARY)