Rename module -> module-lib
When sdk_version: "module_current" in an unbundled build, previously
prebuilt/sdk/current/module/android.jar was used. But that path is
wrong; we have prebuilt/sdk/current/module-lib/android.jar for the
module APIs. Fix the mismatch by changing the string name of the module
API from "module" to "module-lib".
Also, "system_server" for system server API is changed to
"system-server" to match with the path
/prebuilts/sdk/current/system-server/.
Bug: N/A
Test: https://android-build.googleplex.com/builds/forrest/run/L86100000601675127
Merged-In: I23e9befbd9592d3b22989c2c8fbf34d434273288
Change-Id: I23e9befbd9592d3b22989c2c8fbf34d434273288
(cherry picked from commit 49062c89f9304390944e8ba138758d5eea25a757)
diff --git a/java/sdk.go b/java/sdk.go
index f96ecde..6c16651 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -94,9 +94,9 @@
case sdkCorePlatform:
return "core_platform"
case sdkModule:
- return "module"
+ return "module-lib"
case sdkSystemServer:
- return "system_server"
+ return "system-server"
default:
return "invalid"
}