commit f78db71dae9f8b96a979ef6e72838bdc09e793bd
author Jiyong Park <jiyong@google.com> Sat Sep 16 01:09:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 16 01:09:06 2017 +0000
tree 96b6d56d6ac61ad6f2158a14733dcdfe3bfc3109
parent 0a6419040f9921ac669dc62d6742d401587bdb61
parent a7603c38ac8c96591fd776ab029e4eb5e3674d36

Merge changes from topic "hidl_for_test_aosp"
am: a7603c38ac

Change-Id: I92acd703df3ed100255e63c9ec511eec3c0a97a3

tests/trie/1.0/.hidl_for_test

diff --git a/tests/trie/1.0/.hidl_for_test b/tests/trie/1.0/.hidl_for_test
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/trie/1.0/.hidl_for_test

tests/trie/1.0/Android.bp

diff --git a/tests/trie/1.0/Android.bp b/tests/trie/1.0/Android.bp
index fcc4325..9e11c3e 100644
--- a/tests/trie/1.0/Android.bp
+++ b/tests/trie/1.0/Android.bp
@@ -46,9 +46,6 @@
     generated_headers: ["android.hardware.tests.trie@1.0_genc++_headers"],
     export_generated_headers: ["android.hardware.tests.trie@1.0_genc++_headers"],
     vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
     shared_libs: [
         "libhidlbase",
         "libhidltransport",