diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp
index c61d989..113b3ea 100644
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -150,6 +150,142 @@
 }
 
 genrule {
+    name: "android.hardware.wifi-V1.0-java_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+    srcs: [
+        ":android.hardware.wifi@1.0_hal",
+    ],
+    out: [
+        "android/hardware/wifi/V1_0/IfaceType.java",
+        "android/hardware/wifi/V1_0/NanBandIndex.java",
+        "android/hardware/wifi/V1_0/NanBandSpecificConfig.java",
+        "android/hardware/wifi/V1_0/NanCapabilities.java",
+        "android/hardware/wifi/V1_0/NanCipherSuiteType.java",
+        "android/hardware/wifi/V1_0/NanClusterEventInd.java",
+        "android/hardware/wifi/V1_0/NanClusterEventType.java",
+        "android/hardware/wifi/V1_0/NanConfigRequest.java",
+        "android/hardware/wifi/V1_0/NanDataPathChannelCfg.java",
+        "android/hardware/wifi/V1_0/NanDataPathConfirmInd.java",
+        "android/hardware/wifi/V1_0/NanDataPathRequestInd.java",
+        "android/hardware/wifi/V1_0/NanDataPathSecurityConfig.java",
+        "android/hardware/wifi/V1_0/NanDataPathSecurityType.java",
+        "android/hardware/wifi/V1_0/NanDebugConfig.java",
+        "android/hardware/wifi/V1_0/NanDiscoveryCommonConfig.java",
+        "android/hardware/wifi/V1_0/NanEnableRequest.java",
+        "android/hardware/wifi/V1_0/NanFollowupReceivedInd.java",
+        "android/hardware/wifi/V1_0/NanInitiateDataPathRequest.java",
+        "android/hardware/wifi/V1_0/NanMatchAlg.java",
+        "android/hardware/wifi/V1_0/NanMatchInd.java",
+        "android/hardware/wifi/V1_0/NanParamSizeLimits.java",
+        "android/hardware/wifi/V1_0/NanPublishRequest.java",
+        "android/hardware/wifi/V1_0/NanPublishType.java",
+        "android/hardware/wifi/V1_0/NanRangingIndication.java",
+        "android/hardware/wifi/V1_0/NanRespondToDataPathIndicationRequest.java",
+        "android/hardware/wifi/V1_0/NanSrfType.java",
+        "android/hardware/wifi/V1_0/NanStatusType.java",
+        "android/hardware/wifi/V1_0/NanSubscribeRequest.java",
+        "android/hardware/wifi/V1_0/NanSubscribeType.java",
+        "android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java",
+        "android/hardware/wifi/V1_0/NanTxType.java",
+        "android/hardware/wifi/V1_0/RttBw.java",
+        "android/hardware/wifi/V1_0/RttCapabilities.java",
+        "android/hardware/wifi/V1_0/RttConfig.java",
+        "android/hardware/wifi/V1_0/RttLciInformation.java",
+        "android/hardware/wifi/V1_0/RttLcrInformation.java",
+        "android/hardware/wifi/V1_0/RttMotionPattern.java",
+        "android/hardware/wifi/V1_0/RttPeerType.java",
+        "android/hardware/wifi/V1_0/RttPreamble.java",
+        "android/hardware/wifi/V1_0/RttResponder.java",
+        "android/hardware/wifi/V1_0/RttResult.java",
+        "android/hardware/wifi/V1_0/RttStatus.java",
+        "android/hardware/wifi/V1_0/RttType.java",
+        "android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java",
+        "android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java",
+        "android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java",
+        "android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java",
+        "android/hardware/wifi/V1_0/StaBackgroundScanParameters.java",
+        "android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java",
+        "android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java",
+        "android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java",
+        "android/hardware/wifi/V1_0/StaLinkLayerStats.java",
+        "android/hardware/wifi/V1_0/StaRoamingCapabilities.java",
+        "android/hardware/wifi/V1_0/StaRoamingConfig.java",
+        "android/hardware/wifi/V1_0/StaRoamingState.java",
+        "android/hardware/wifi/V1_0/StaScanData.java",
+        "android/hardware/wifi/V1_0/StaScanDataFlagMask.java",
+        "android/hardware/wifi/V1_0/StaScanLimits.java",
+        "android/hardware/wifi/V1_0/StaScanResult.java",
+        "android/hardware/wifi/V1_0/WifiBand.java",
+        "android/hardware/wifi/V1_0/WifiChannelInfo.java",
+        "android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java",
+        "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java",
+        "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java",
+        "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java",
+        "android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java",
+        "android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java",
+        "android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java",
+        "android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java",
+        "android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java",
+        "android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java",
+        "android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java",
+        "android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java",
+        "android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java",
+        "android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java",
+        "android/hardware/wifi/V1_0/WifiInformationElement.java",
+        "android/hardware/wifi/V1_0/WifiNanStatus.java",
+        "android/hardware/wifi/V1_0/WifiRateInfo.java",
+        "android/hardware/wifi/V1_0/WifiRateNss.java",
+        "android/hardware/wifi/V1_0/WifiRatePreamble.java",
+        "android/hardware/wifi/V1_0/WifiStatus.java",
+        "android/hardware/wifi/V1_0/WifiStatusCode.java",
+        "android/hardware/wifi/V1_0/IWifi.java",
+        "android/hardware/wifi/V1_0/IWifiApIface.java",
+        "android/hardware/wifi/V1_0/IWifiChip.java",
+        "android/hardware/wifi/V1_0/IWifiChipEventCallback.java",
+        "android/hardware/wifi/V1_0/IWifiEventCallback.java",
+        "android/hardware/wifi/V1_0/IWifiIface.java",
+        "android/hardware/wifi/V1_0/IWifiNanIface.java",
+        "android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java",
+        "android/hardware/wifi/V1_0/IWifiP2pIface.java",
+        "android/hardware/wifi/V1_0/IWifiRttController.java",
+        "android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java",
+        "android/hardware/wifi/V1_0/IWifiStaIface.java",
+        "android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.wifi-V1.0-java",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.wifi-V1.0-java_gen_java"],
+    libs: [
+        "hwbinder",
+        "android.hidl.base-V1.0-java",
+    ]
+}
+
+genrule {
+    name: "android.hardware.wifi-V1.0-java-constants_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
+    srcs: [
+        ":android.hardware.wifi@1.0_hal",
+    ],
+    out: [
+        "android/hardware/wifi/V1_0/Constants.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.wifi-V1.0-java-constants",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.wifi-V1.0-java-constants_gen_java"],
+}
+
+genrule {
     name: "android.hardware.wifi@1.0-adapter-helper_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.0",
@@ -197,7 +333,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hardware.wifi@1.0-adapter-helper",
     defaults: ["hidl-module-defaults"],