Update makefiles for Android.bp Java.

Also, moved legacy android.hidl.base-V1.0-java-static
target into a more maintainable location until we can
completely remove it.

Bug: 33420795
Test: pass
Change-Id: I3144d83ff3f691b21c96068a9605e2b3481bdea7
diff --git a/transport/token/1.0/Android.bp b/transport/token/1.0/Android.bp
index d410567..1bc6d97 100644
--- a/transport/token/1.0/Android.bp
+++ b/transport/token/1.0/Android.bp
@@ -62,6 +62,32 @@
 }
 
 genrule {
+    name: "android.hidl.token-V1.0-java_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
+    srcs: [
+        ":android.hidl.token@1.0_hal",
+    ],
+    out: [
+        "android/hidl/token/V1_0/ITokenManager.java",
+    ],
+}
+
+java_library {
+    name: "android.hidl.token-V1.0-java",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hidl.token-V1.0-java_gen_java"],
+    libs: [
+        "hwbinder",
+        "android.hidl.base-V1.0-java",
+    ]
+}
+
+// This package does not export any types. Not creating java constants export.
+
+
+genrule {
     name: "android.hidl.token@1.0-adapter-helper_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport android.hidl.token@1.0",
@@ -85,7 +111,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hidl.token@1.0-adapter-helper",
     defaults: ["hidl-module-defaults"],