commit 50c3ab6ac155cf88dcb4478570da3eb8ed578a6b
author Jiyong Park <jiyong@google.com> Mon Jan 20 12:37:52 2020 +0900
committer Jiyong Park <jiyong@google.com> Mon Jan 20 12:37:52 2020 +0900
tree 16fa4f78c9c3afc20db6e9b00b8f409c38f1a485
parent 6492a6abf64b54b73833907306203871c66b6932

Fixed a wrong AIDL import path

AIDL import path should point to a root directory where relative path to
an AIDL file encodes the fully qualified name of the type in the file.

Since libvold_binder imports types like
android.os.incremental.IncrementalFileSystemControlParcel which are
under frameworks/base/core/java, the import path should set to the path,
not to the sub directory that directly has the AIDL files.

Bug: 147918827
Test: m
Change-Id: Ic4941578813eced5a7eb59a0656c10b76e902515

Android.bp

diff --git a/Android.bp b/Android.bp
index 8d88e5f..fd6ef1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,7 +81,7 @@
         local_include_dirs: ["binder"],
         include_dirs: [
             "frameworks/native/aidl/binder",
-            "frameworks/base/core/java/android/os/incremental",
+            "frameworks/base/core/java",
         ],
         export_aidl_headers: true,
     },