Merge "reflect libbinder->libpermission: appops" am: 12d2d7fd9c am: 66f91640b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674207

Change-Id: I1ba2b9d6d8d9ce5fbdbc4b28c82ccdb76cd38875

core/java/com/android/internal/app/IAppOpsCallback.aidl

@@ -17,7 +17,7 @@
 package com.android.internal.app;
 
 // This interface is also used by native code, so must
-// be kept in sync with frameworks/native/libs/binder/include/binder/IAppOpsCallback.h
+// be kept in sync with frameworks/native/libs/permission/include/binder/IAppOpsCallback.h
 oneway interface IAppOpsCallback {
     void opChanged(int op, int uid, String packageName);
 }

core/java/com/android/internal/app/IAppOpsService.aidl

@@ -32,7 +32,7 @@ import com.android.internal.app.MessageSamplingConfig;
 
 interface IAppOpsService {
     // These methods are also called by native code, so must
-    // be kept in sync with frameworks/native/libs/binder/include/binder/IAppOpsService.h
+    // be kept in sync with frameworks/native/libs/permission/include/binder/IAppOpsService.h
     // and not be reordered
     int checkOperation(int code, int uid, String packageName);
     int noteOperation(int code, int uid, String packageName, @nullable String attributionTag,

services/incremental/Android.bp

@@ -76,6 +76,7 @@ cc_defaults {
         "libcutils",
         "libincfs",
         "liblog",
+        "libpermission",
         "libz",
         "libziparchive",
     ],