From 12ae093695ff86530fffdecebcc012a7d8f4a30a Mon Sep 17 00:00:00 2001
From: Harish Mahendrakar <hmahendrakar@google.com>
Date: Wed, 29 Nov 2023 06:12:09 +0000
Subject: Enable android build targets

Bug: 313791883
Test: treehugger
Change-Id: I4d97c76ac505774e0308c7e8eed48e127816405c
---
 Android.bp                            | 9 +++------
 adobe-hdr-gain-map-license/Android.bp | 2 +-
 benchmark/Android.bp                  | 1 -
 examples/Android.bp                   | 1 -
 fuzzer/Android.bp                     | 9 +++------
 tests/Android.bp                      | 3 +--
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Android.bp b/Android.bp
index ce5f3a0..caf0136 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,8 +32,7 @@ license {
 }
 
 cc_library {
-    name: "libultrahdr-new",
-    enabled: false,
+    name: "libultrahdr",
     host_supported: true,
     vendor_available: true,
     export_include_dirs: ["lib/include"],
@@ -57,8 +56,7 @@ cc_library {
 }
 
 cc_library {
-    name: "libjpegencoder-new",
-    enabled: false,
+    name: "libjpegencoder",
     host_supported: true,
     vendor_available: true,
 
@@ -75,8 +73,7 @@ cc_library {
 }
 
 cc_library {
-    name: "libjpegdecoder-new",
-    enabled: false,
+    name: "libjpegdecoder",
     host_supported: true,
     vendor_available: true,
 
diff --git a/adobe-hdr-gain-map-license/Android.bp b/adobe-hdr-gain-map-license/Android.bp
index 9cff26f..e999a8b 100644
--- a/adobe-hdr-gain-map-license/Android.bp
+++ b/adobe-hdr-gain-map-license/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 license {
-    name: "adobe_hdr_gain_map_license-new",
+    name: "adobe_hdr_gain_map_license",
     license_kinds: ["legacy_by_exception_only"],
     license_text: ["NOTICE"],
 }
diff --git a/benchmark/Android.bp b/benchmark/Android.bp
index 0764437..1dc6ccf 100644
--- a/benchmark/Android.bp
+++ b/benchmark/Android.bp
@@ -23,7 +23,6 @@ package {
 
 cc_benchmark {
     name: "ultrahdr_benchmark",
-    enabled: false,
     host_supported: true,
     srcs: ["benchmark_test.cpp"],
     static_libs: [
diff --git a/examples/Android.bp b/examples/Android.bp
index 9591e03..0ede18b 100644
--- a/examples/Android.bp
+++ b/examples/Android.bp
@@ -38,5 +38,4 @@ cc_binary {
         "libjpegencoder",
         "libultrahdr",
     ],
-    enabled: false,
 }
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 0c14bf7..b366fd8 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -22,8 +22,7 @@ package {
 }
 
 cc_defaults {
-    name: "ultrahdr_fuzzer_defaults-new",
-    enabled: false,
+    name: "ultrahdr_fuzzer_defaults",
     host_supported: true,
     shared_libs: [
         "libimage_io",
@@ -53,8 +52,7 @@ cc_defaults {
 }
 
 cc_fuzz {
-    name: "ultrahdr_enc_fuzzer-new",
-    enabled: false,
+    name: "ultrahdr_enc_fuzzer",
     defaults: ["ultrahdr_fuzzer_defaults"],
     srcs: [
         "ultrahdr_enc_fuzzer.cpp",
@@ -62,8 +60,7 @@ cc_fuzz {
 }
 
 cc_fuzz {
-    name: "ultrahdr_dec_fuzzer-new",
-    enabled: false,
+    name: "ultrahdr_dec_fuzzer",
     defaults: ["ultrahdr_fuzzer_defaults"],
     srcs: [
         "ultrahdr_dec_fuzzer.cpp",
diff --git a/tests/Android.bp b/tests/Android.bp
index 1b7cfd5..8fe1621 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -22,8 +22,7 @@ package {
 }
 
 cc_test {
-    name: "ultrahdr_unit_test-new",
-    enabled: false,
+    name: "ultrahdr_unit_test",
     test_suites: ["device-tests"],
     srcs: [
         "gainmapmath_test.cpp",
-- 
cgit v1.2.3