Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544010a9 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "reflect libbinder/am split" into sc-dev

parents 1bec64d1 8e6aa667
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 ======================

    /**
+1 −0
Original line number Diff line number Diff line
@@ -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",