commit fd75822b92395062dbbf1dff5a1ead76e9ebeb7e
author Treehugger Robot <treehugger-gerrit@google.com> Sun Feb 12 02:52:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 12 02:52:51 2017 +0000
tree 6feb90c2f2a9dd627f4ffe46ce86afe760e883dd
parent 9f05a5934e43005ba9c9c66b7effa0f316100665
parent e7fcfdd200cbaa07ac65ea4953ff77fc5dcf0077

Merge "New naming convention for func fuzzer build module."

sysfuzzer/vtscompiler/code_gen/fuzzer/HalHidlFuzzerCodeGen.cpp

diff --git a/sysfuzzer/vtscompiler/code_gen/fuzzer/HalHidlFuzzerCodeGen.cpp b/sysfuzzer/vtscompiler/code_gen/fuzzer/HalHidlFuzzerCodeGen.cpp
index a253ee8..080fbf4 100644
--- a/sysfuzzer/vtscompiler/code_gen/fuzzer/HalHidlFuzzerCodeGen.cpp
+++ b/sysfuzzer/vtscompiler/code_gen/fuzzer/HalHidlFuzzerCodeGen.cpp
@@ -141,8 +141,10 @@
     const FunctionSpecificationMessage &func_spec) {
   string package = comp_spec_.package();
   string version = GetVersionString(comp_spec_.component_type_version());
+  string iface_name = comp_spec_.component_name();
   string func_name = func_spec.name();
-  return package + "@" + version + "-vts.func_fuzzer-" + func_name;
+  return package + "@" + version + "-vts.func_fuzzer." + iface_name + "." +
+         func_name;
 }
 
 string HalHidlFuzzerCodeGen::GetFuzzerSourceName(

sysfuzzer/vtscompiler/test/golden/FUZZER/Android.bp

diff --git a/sysfuzzer/vtscompiler/test/golden/FUZZER/Android.bp b/sysfuzzer/vtscompiler/test/golden/FUZZER/Android.bp
index b0d3ffb..c5a49c6 100644
--- a/sysfuzzer/vtscompiler/test/golden/FUZZER/Android.bp
+++ b/sysfuzzer/vtscompiler/test/golden/FUZZER/Android.bp
@@ -1,7 +1,7 @@
 // This file was auto-generated by VTS compiler.
 
 cc_binary {
-    name: "android.hardware.nfc@1.0-vts.func_fuzzer-open",
+    name: "android.hardware.nfc@1.0-vts.func_fuzzer.INfc.open",
     srcs: ["INfc_open_fuzzer.cpp"],
     include_dirs: ["external/llvm/lib/Fuzzer"],
     shared_libs: [
@@ -19,7 +19,7 @@
 }
 
 cc_binary {
-    name: "android.hardware.nfc@1.0-vts.func_fuzzer-write",
+    name: "android.hardware.nfc@1.0-vts.func_fuzzer.INfc.write",
     srcs: ["INfc_write_fuzzer.cpp"],
     include_dirs: ["external/llvm/lib/Fuzzer"],
     shared_libs: [
@@ -37,7 +37,7 @@
 }
 
 cc_binary {
-    name: "android.hardware.nfc@1.0-vts.func_fuzzer-coreInitialized",
+    name: "android.hardware.nfc@1.0-vts.func_fuzzer.INfc.coreInitialized",
     srcs: ["INfc_coreInitialized_fuzzer.cpp"],
     include_dirs: ["external/llvm/lib/Fuzzer"],
     shared_libs: [