Remove unused Android.bp and update names of licenses

- Android.bp in third_party image_io and modp_b64 are deleted as
these will not be used from these folders.

- Updated license entries in Android.bp to refer to the LICENSE
file in libultrahdr folder

5 files changed, 16 insertions, 146 deletions

diff --git a/Android.bp b/Android.bp
index cbb5f0f..b229e0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,11 +15,22 @@
 package {
     // See: http://go/android-license-faq
     default_applicable_licenses: [
-        "frameworks_native_license",
+        "external_libultrahdr_license",
         "adobe_hdr_gain_map_license",
     ],
 }
 
+license {
+    name: "external_libultrahdr_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library {
     name: "libultrahdr",
     host_supported: true,
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index c149fea..b366fd8 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -15,10 +15,10 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
+    // all of the 'license_kinds' from "external_libultrahdr_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
+    default_applicable_licenses: ["external_libultrahdr_license"],
 }
 
 cc_defaults {
diff --git a/tests/Android.bp b/tests/Android.bp
index 0979c5f..e175155 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -15,10 +15,10 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
+    // all of the 'license_kinds' from "external_libultrahdr_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
+    default_applicable_licenses: ["external_libultrahdr_license"],
 }
 
 cc_test {
diff --git a/third_party/image_io/Android.bp b/third_party/image_io/Android.bp
deleted file mode 100644
index 20a7939..0000000
--- a/third_party/image_io/Android.bp
+++ /dev/null
@@ -1,75 +0,0 @@
-package {
-    default_applicable_licenses: ["external_image_io_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_image_io_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
-cc_defaults {
-    name: "libimage_io-defaults",
-    cflags: [
-        "-DUNIX_ENV=1",
-        "-Werror",
-        "-Wno-reorder",
-        "-Wno-unused-parameter",
-    ],
-    rtti: true,
-    cppflags: ["-fno-exceptions"],
-
-    sanitize: {
-        misc_undefined: [
-            "unsigned-integer-overflow",
-            "signed-integer-overflow",
-        ],
-    },
-}
-
-cc_library_headers {
-    name: "libimage_io-headers",
-    host_supported: true,
-    vendor_available: true,
-    export_include_dirs: ["includes"],
-}
-
-
-cc_library {
-    name: "libimage_io",
-    host_supported: true,
-    vendor_available: true,
-    defaults: ["libimage_io-defaults"],
-    header_libs: ["libimage_io-headers"],
-    export_include_dirs: ["includes"],
-    srcs: ["src/**/*.cc"],
-    static_libs: [
-        "libmodpb64",
-    ],
-}
-
-cc_library_headers {
-  name: "libimage_io_ndk-headers",
-  export_include_dirs: ["includes"],
-  sdk_version: "current",
-}
-
-cc_library_static {
-    name: "libimage_io_ndk",
-    defaults: ["libimage_io-defaults"],
-    header_libs: ["libimage_io_ndk-headers"],
-    export_include_dirs: ["includes"],
-    srcs: ["src/**/*.cc"],
-    static_libs: [
-        "libmodpb64_ndk",
-    ],
-    sdk_version: "current",
-    stl: "c++_static",
-}
diff --git a/third_party/image_io/src/modp_b64/Android.bp b/third_party/image_io/src/modp_b64/Android.bp
deleted file mode 100644
index f676064..0000000
--- a/third_party/image_io/src/modp_b64/Android.bp
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    default_applicable_licenses: ["external_modp_b64_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_modp_b64_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-BSD",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
-cc_library_static {
-    name: "libmodpb64",
-    host_supported: true,
-    ramdisk_available: true,
-    recovery_available: true,
-    vendor_available: true,
-    srcs: ["modp_b64.cc"],
-
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-    local_include_dirs: ["modp_b64"],
-    export_include_dirs: ["."],
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.btservices",
-    ],
-}
-
-cc_library_static {
-    name: "libmodpb64_ndk",
-    vendor_available: false,
-    srcs: ["modp_b64.cc"],
-
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
-    local_include_dirs: ["modp_b64"],
-    export_include_dirs: ["."],
-    sdk_version: "current",
-    stl: "c++_static",
-}