commit 235f9b1078decaab5fd3146ce37e823ceb0e4c43
author Baligh Uddin <baligh@google.com> Tue Feb 15 23:25:53 2022 +0000
committer Baligh Uddin <baligh@google.com> Thu Feb 17 16:01:56 2022 +0000
tree 8cc77552d37dbae41ccb034e1acdd69bb25adf25
parent b681fec035754ed1f7c319a1fc9fe6d92fb0555c

Remove apex/media - migrated to packages/modules/Media

Fix references for local_include_dirs for aidl support.

BUG: 171106157
Test: Local build and TH
Merged-In: Ice516a0ab0819c4a076c394c05be1643461d4309
Change-Id: I3625bf1e262a031263d500b2c6129bf3c18cdeb2

Android.bp

diff --git a/Android.bp b/Android.bp
index 5bd3329..5e16f9b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -175,7 +175,6 @@
             "sax/java",
             "telecomm/java",
 
-            "apex/media/aidl/stable",
             // TODO(b/147699819): remove this
             "telephony/java",
         ],
@@ -274,6 +273,7 @@
             // TODO: remove when moved to the below package
             "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
             "packages/modules/Connectivity/framework/aidl-export",
+            "packages/modules/Media/apex/aidl/stable",
         ],
     },
     dxflags: [
@@ -549,11 +549,9 @@
 stubs_defaults {
     name: "module-classpath-stubs-defaults",
     aidl: {
-        local_include_dirs: [
-            "apex/media/aidl/stable",
-        ],
         include_dirs: [
             "packages/modules/Connectivity/framework/aidl-export",
+            "packages/modules/Media/apex/aidl/stable",
         ],
     },
     libs: [