commit 133d9178ec86c210923300c6dd00fb89903ead69
author Baligh Uddin <baligh@google.com> Sun May 23 17:47:28 2021 +0000
committer Baligh Uddin <baligh@google.com> Sun May 23 18:54:37 2021 +0000
tree 829a41a3aa67b26c26629086b81be7b8047fd90b
parent bbd1ca58618edfc22f0ae11f0ecea681f8f50b23
parent 90a2635232da277ee0d2f8f4645d93b4066a8f38

Merge history of packages/Connectivity

Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd

Tethering/common/TetheringLib/Android.bp

diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index d868f39..6f8e986 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -30,7 +30,7 @@
     stub_only_libs: ["framework-connectivity.stubs.module_lib"],
     aidl: {
         include_dirs: [
-            "frameworks/base/packages/Connectivity/framework/aidl-export",
+            "packages/modules/Connectivity/framework/aidl-export",
         ],
     },