From 624ef93660acf09a9c85eb861734c62758263c1e Mon Sep 17 00:00:00 2001
From: Risan <risan@google.com>
Date: Wed, 22 Jan 2020 14:52:09 +0900
Subject: [PATCH] Export AlarmManagerService as a filegroup

ARCVM needs to replace the file replaced by product_variable.arc back to
the original version. By exporting this original version, ARCVM can
pick it up and use it.

Bug: 135558634
Test: Compile bertha and cheets, and manually check the conditional.
Change-Id: I1bb2bd5f631d9f9a3271c1f5672da181785ca289
Merged-In: I1bb2bd5f631d9f9a3271c1f5672da181785ca289
---
 services/core/jni/Android.bp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 77d814e3076be..4a2636ee6ca42 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -14,6 +14,7 @@ cc_library_static {
 
     srcs: [
         ":graphicsstats_proto",
+        ":lib_alarmManagerService_native",
         "BroadcastRadio/JavaRef.cpp",
         "BroadcastRadio/NativeCallbackThread.cpp",
         "BroadcastRadio/BroadcastRadioService.cpp",
@@ -21,7 +22,6 @@ cc_library_static {
         "BroadcastRadio/TunerCallback.cpp",
         "BroadcastRadio/convert.cpp",
         "BroadcastRadio/regions.cpp",
-        "com_android_server_AlarmManagerService.cpp",
         "com_android_server_am_BatteryStatsService.cpp",
         "com_android_server_connectivity_Vpn.cpp",
         "com_android_server_ConsumerIrService.cpp",
@@ -182,3 +182,10 @@ filegroup {
         "com_android_server_net_NetworkStatsFactory.cpp",
     ],
 }
+
+filegroup {
+    name: "lib_alarmManagerService_native",
+    srcs: [
+        "com_android_server_AlarmManagerService.cpp",
+    ],
+}