1 files changed, 9 insertions, 88 deletions

diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index b03e24cd1a..b37db434a5 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -15,23 +15,6 @@
  */
 
 // TODO(b/31559095): bionic on host should define this
-package {
-    default_applicable_licenses: ["frameworks_native_libs_binder_ndk_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "frameworks_native_libs_binder_ndk_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 cc_defaults {
     name: "libbinder_ndk_host_user",
     target: {
@@ -43,9 +26,6 @@ cc_defaults {
                 "-D__ANDROID_API__=10000",
             ],
         },
-        darwin: {
-            enabled: false,
-        },
     },
 }
 
@@ -55,12 +35,7 @@ cc_library {
     defaults: ["libbinder_ndk_host_user"],
     host_supported: true,
 
-    llndk: {
-        symbol_file: "libbinder_ndk.map.txt",
-    },
-
     export_include_dirs: [
-        "include_cpp",
         "include_ndk",
         "include_platform",
     ],
@@ -106,9 +81,6 @@ cc_library {
         linux: {
             version_script: "libbinder_ndk.map.txt",
         },
-        darwin: {
-            enabled: false,
-        },
     },
     stubs: {
         symbol_file: "libbinder_ndk.map.txt",
@@ -117,55 +89,6 @@ cc_library {
             "30",
         ],
     },
-    tidy: true,
-    tidy_flags: [
-        // Only check our headers
-        "--header-filter=^.*frameworks/native/libs/binder/.*.h$",
-    ],
-    tidy_checks_as_errors: [
-        // Explicitly list the checks that should not occur in this module.
-        "abseil-*",
-        "android-*",
-        "bugprone-*",
-        "cert-*",
-        "clang-analyzer-*",
-        "-clang-analyzer-core.CallAndMessage",
-        "-clang-analyzer-core.uninitialized.Assign",
-        "-clang-analyzer-unix.Malloc",
-        "-clang-analyzer-deadcode.DeadStores",
-        "-clang-analyzer-optin.cplusplus.UninitializedObject",
-        "google-*",
-        "-google-readability-*",
-        "-google-runtime-references",
-        "misc-*",
-        "-misc-no-recursion",
-        "-misc-non-private-member-variables-in-classes",
-        "-misc-redundant-expression",
-        "-misc-unused-parameters",
-        "-misc-unused-using-decls",
-        "performance*",
-        "portability*",
-    ],
-}
-
-cc_library_headers {
-    name: "libbinder_headers_platform_shared",
-    export_include_dirs: ["include_cpp"],
-    vendor_available: true,
-    host_supported: true,
-    // TODO(b/153609531): remove when no longer needed.
-    native_bridge_supported: true,
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.media",
-        "com.android.media.swcodec",
-    ],
-    min_sdk_version: "29",
 }
 
 ndk_headers {
@@ -178,19 +101,17 @@ ndk_headers {
     license: "NOTICE",
 }
 
-// TODO(b/160624671): package with the aidl compiler
-ndk_headers {
-    name: "libbinder_ndk_helper_headers",
-    from: "include_cpp/android",
-    to: "android",
-    srcs: [
-        "include_cpp/android/*.h",
-    ],
-    license: "NOTICE",
-}
-
 ndk_library {
     name: "libbinder_ndk",
     symbol_file: "libbinder_ndk.map.txt",
     first_version: "29",
 }
+
+llndk_library {
+    name: "libbinder_ndk",
+    symbol_file: "libbinder_ndk.map.txt",
+    export_include_dirs: [
+        "include_ndk",
+        "include_platform",
+    ],
+}