From 12d15750feaa841f3d80599074c1b68a430da0d2 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 5 Aug 2020 16:25:33 -0700
Subject: [PATCH] Convert healthd_test to Soong

This makefile is not included before, so it was never built. Also do
the following changes to make sure it works:

- Remove non-existing libhealthd_internal dep
- Add necessary libhealthd_charger dep because it tests AnimationParser
- Since it tests AnimationParser, change its name to
libhealthd_charger_test

Test: run it

Change-Id: If7f91de4b910024f27d09a25ca801e67b98221db
---
 healthd/Android.bp                           | 13 ++++++++++++
 healthd/{tests => }/AnimationParser_test.cpp |  0
 healthd/tests/Android.mk                     | 21 --------------------
 3 files changed, 13 insertions(+), 21 deletions(-)
 rename healthd/{tests => }/AnimationParser_test.cpp (100%)
 delete mode 100644 healthd/tests/Android.mk

diff --git a/healthd/Android.bp b/healthd/Android.bp
index 14d46b3d3..3a7ab75d2 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -240,3 +240,16 @@ cc_test {
     defaults: ["charger_defaults"],
     srcs: ["charger_test.cpp"],
 }
+
+cc_test {
+    name: "libhealthd_charger_test",
+    srcs: ["AnimationParser_test.cpp"],
+    shared_libs: [
+        "liblog",
+        "libbase",
+        "libcutils",
+    ],
+    static_libs: [
+        "libhealthd_charger",
+    ],
+}
diff --git a/healthd/tests/AnimationParser_test.cpp b/healthd/AnimationParser_test.cpp
similarity index 100%
rename from healthd/tests/AnimationParser_test.cpp
rename to healthd/AnimationParser_test.cpp
diff --git a/healthd/tests/Android.mk b/healthd/tests/Android.mk
deleted file mode 100644
index 87e8862d0..000000000
--- a/healthd/tests/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016 The Android Open Source Project
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    AnimationParser_test.cpp \
-
-LOCAL_MODULE := healthd_test
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_STATIC_LIBRARIES := \
-	libhealthd_internal \
-
-LOCAL_SHARED_LIBRARIES := \
-	liblog \
-	libbase \
-	libcutils \
-
-include $(BUILD_NATIVE_TEST)