diff options
| author | 2020-03-23 10:02:09 -0700 | |
|---|---|---|
| committer | 2020-03-23 10:21:25 -0700 | |
| commit | b8d7fab941f74951e71338b3df0015a500b484ff (patch) | |
| tree | 974fb78a4ac15a1e878212374357994c1162077e /service | |
| parent | d31a25a45bb3d5f74f5eee6c8e6ee0ab306656f5 (diff) | |
Rename wifi-service to service-wifi
Only rename the service.jar, the intermediates still use wifi-service.
Bug: 145195135
Test: Device boots up and connects to wifi networks.
Change-Id: Ic2f7bb39060235994ef39e445fd2a9fe074c40af
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.bp | 3 | ||||
| -rw-r--r-- | service/CleanSpec.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/service/Android.bp b/service/Android.bp index 22cb3a5435..928f9c5543 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -99,7 +99,7 @@ java_library { // wifi-service static library // ============================================================ java_library { - name: "wifi-service", + name: "service-wifi", defaults: ["wifi-service-common"], installable: true, static_libs: ["wifi-service-pre-jarjar"], @@ -146,6 +146,7 @@ genrule { // TODO: This should be signed by a wifi specific certificate. // ============================================================ android_app { + // TODO: Rename to service-wifi-resources? What about b/151678653? name: "wifi-service-resources", defaults: ["wifi-service-common"], resource_dirs: [ diff --git a/service/CleanSpec.mk b/service/CleanSpec.mk index 603ba73bde..2b4e166171 100644 --- a/service/CleanSpec.mk +++ b/service/CleanSpec.mk @@ -54,6 +54,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/wifi-service.jar) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/wifi-service-resources) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libwifi-jni.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libwifi-jni.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.wifi.apex) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.wifi) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |