commit b8b46fde2a7fe62a6dac431b5a9295454f2bf214
author Baligh Uddin <baligh@google.com> Fri Feb 11 14:20:10 2022 +0000
committer Baligh Uddin <baligh@google.com> Wed Feb 16 16:00:58 2022 +0000
tree 29056f935f0532399ec998c1192987e94e0178ef
parent bee3ff15135676683b54c8ea45a62cc920188276

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

Fix references for local_include_dirs for aidl support.

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

Android.bp

diff --git a/Android.bp b/Android.bp
index ee5db70..05175d9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -191,7 +191,6 @@
             "sax/java",
             "telecomm/java",
 
-            "apex/media/aidl/stable",
             // TODO(b/147699819): remove this
             "telephony/java",
         ],
@@ -289,6 +288,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",
             "hardware/interfaces/graphics/common/aidl",
         ],
     },
@@ -538,6 +538,7 @@
             "frameworks/native/libs/permission/aidl",
             // TODO: remove when moved to the below package
             "frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
+            "packages/modules/Media/apex/aidl/stable",
             "packages/modules/Connectivity/framework/aidl-export",
             "hardware/interfaces/graphics/common/aidl",
         ],
@@ -575,11 +576,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: [