Merge "reflect libbinder/am split"

2021-04-08 21:03:27 +00:00
parent ca0501d1b8 2b5acf1040
commit da164b6f83
2 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/IUidObserver.aidl
+++ b/core/java/android/app/IUidObserver.aidl
@@ -24,7 +24,7 @@ oneway interface IUidObserver {
    // below block of transactions.

    // Since these transactions are also called from native code, these must be kept in sync with
-    // the ones in frameworks/native/include/binder/IActivityManager.h
+    // the ones in frameworks/native/include_activitymanager/binder/IActivityManager.h
    // =============== Beginning of transactions used on native side as well ======================

    /**
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -77,6 +77,7 @@ cc_library_shared {
        "libgui",
        "libharfbuzz_ng",  // Only for including hb.h via minikin
        "libsensor",
+        "libactivitymanager_aidl",
        "libandroid_runtime",
        "libminikin",
        "libnetd_client",