Add proguard to nearby service target.
Also fixed a few minor issues.
Bug: 189355156
Test: install on sunfish && atest NearbyUnitTests
Change-Id: I8f5cc990e69940a48fdad24713015690bdc6d3cd
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 5b026fa..13dd6a9 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -43,6 +43,7 @@
optimize: {
enabled: true,
shrink: true,
+ proguard_flags_files: ["proguard.flags"],
},
dex_preopt: {
enabled: false,
diff --git a/nearby/service/java/com/android/server/nearby/NearbyService.java b/nearby/service/java/com/android/server/nearby/NearbyService.java
index 5647a4d..d0d7c94 100644
--- a/nearby/service/java/com/android/server/nearby/NearbyService.java
+++ b/nearby/service/java/com/android/server/nearby/NearbyService.java
@@ -17,15 +17,19 @@
package com.android.server.nearby;
import android.content.Context;
+import android.util.Log;
import com.android.server.SystemService;
/**
* Service implementing nearby functionality. The actual implementation is delegated to
- * {@link NearbyDeviceScanServiceImpl}.
+ * {@link NearbyServiceImpl}.
*/
// TODO(189954300): Implement nearby service.
public class NearbyService extends SystemService {
+ private static final String TAG = "NearbyService";
+ private static final boolean DBG = true;
+
private final NearbyServiceImpl mImpl;
public NearbyService(Context contextBase) {
@@ -35,6 +39,10 @@
@Override
public void onStart() {
+ if (DBG) {
+ Log.d(TAG, "Publishing NearbyService");
+ }
+
}
@Override
diff --git a/nearby/service/proguard.flags b/nearby/service/proguard.flags
new file mode 100644
index 0000000..55c963f
--- /dev/null
+++ b/nearby/service/proguard.flags
@@ -0,0 +1,5 @@
+# Prevent proguard from stripping out any nearby-service.
+# TODO: This could be optimized in the future to only keep the critical
+# entry points and then let proguard strip out any unused code within
+# the service.
+-keep class com.android.server.nearby.** { *; }