commit 97288acdcff66df30cc443c65ddb815e8d0cfeaa
author Yifan Hong <elsk@google.com> Mon Dec 12 16:03:51 2016 -0800
committer Yifan Hong <elsk@google.com> Tue Dec 13 18:03:41 2016 -0800
tree 536956ac0573c59c2b096ec90058b9d014d97808
parent a47eef385eff3306cef16553ce98e916beb82a38

Update package path for Java.

We used to put IFoo.java with package android.hardware.foo.V1_0
under android/hardware/foo/1.0; the last element is fixed to
V1_0.

Test: compiles
Test: hidl_test_java

Bug: 33554192
Change-Id: I6a6a7d6c0a4c95e7c0797643bc98bec5c12889ca

main.cpp

diff --git a/main.cpp b/main.cpp
index f365778..e28d187 100644
--- a/main.cpp
+++ b/main.cpp
@@ -148,7 +148,8 @@
     out << "\n#"
         << "\nGEN := $(intermediates)/"
         << coordinator->convertPackageRootToPath(packageFQName)
-        << coordinator->getPackagePath(packageFQName, true /* relative */);
+        << coordinator->getPackagePath(packageFQName, true /* relative */,
+                true /* sanitized */);
     if (typeName == nullptr) {
         out << fqName.name() << ".java";
     } else {
@@ -353,7 +354,7 @@
     out << "\n#"
         << "\nGEN := $(intermediates)/"
         << coordinator->convertPackageRootToPath(packageFQName)
-        << coordinator->getPackagePath(packageFQName, true /* relative */)
+        << coordinator->getPackagePath(packageFQName, true /* relative */, true /* sanitized */)
         << "Constants.java";
 
     out << "\n$(GEN): $(HIDL)\n";
@@ -940,7 +941,7 @@
         path.append(coordinator->convertPackageRootToPath(packageFQName));
 
         path.append(coordinator->getPackagePath(
-                    packageFQName, true /* relative */));
+                    packageFQName, true /* relative */, true /* sanitized */));
 
         path.append("Constants.java");
     }