1 files changed, 7 insertions, 27 deletions
diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp
index 928600999c..52d73e0a56 100644
--- a/libs/nativewindow/Android.bp
+++ b/libs/nativewindow/Android.bp
@@ -12,25 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: [
-        "frameworks_native_libs_nativewindow_license",
-    ],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "frameworks_native_libs_nativewindow_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 ndk_headers {
     name: "libnativewindow_ndk_headers",
     from: "include/android",
@@ -47,7 +28,6 @@ cc_library_headers {
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     min_sdk_version: "29",
-    host_supported: true,
 }
 
 ndk_library {
@@ -60,13 +40,6 @@ ndk_library {
 
 cc_library {
     name: "libnativewindow",
-    llndk: {
-        symbol_file: "libnativewindow.map.txt",
-        unversioned: true,
-        override_export_include_dirs: [
-            "include"
-        ],
-    },
     export_include_dirs: [
         "include",
         "include-private",
@@ -121,4 +94,11 @@ cc_library {
     },
 }
 
+llndk_library {
+    name: "libnativewindow",
+    symbol_file: "libnativewindow.map.txt",
+    unversioned: true,
+    export_include_dirs: ["include"],
+}
+
 subdirs = ["tests"]