From 8e6aa6679e58885563b6372ee10972d85db981d4 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 5 Apr 2021 23:19:26 +0000 Subject: [PATCH] reflect libbinder/am split (manual cherry-pick from AOSP to fix merge conflict) Minimizing cost for using libbinder. Bug: 183654927 Test: boot Change-Id: I1a4785a58afcaf2d312ef52a07f41fe3dd3a8fa6 --- core/java/android/app/IUidObserver.aidl | 2 +- native/android/Android.bp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/IUidObserver.aidl b/core/java/android/app/IUidObserver.aidl index 7713e25d5ecd7..74018a8ab1f81 100644 --- 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 ====================== /** diff --git a/native/android/Android.bp b/native/android/Android.bp index 9566b9242fc71..5bb4fbc85bf9c 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -79,6 +79,7 @@ cc_library_shared { "libgui", "libharfbuzz_ng", // Only for including hb.h via minikin "libsensor", + "libactivitymanager_aidl", "libandroid_runtime", "libminikin", "libnetd_client",