diff options
| author | Harish Mahendrakar <hmahendrakar@google.com> | 2023-12-01 20:47:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-01 20:47:22 +0000 |
| commit | be91e199aec3c67f8a4a0263d6b97d353896c94c (patch) | |
| tree | f4ccb049b732c195a54810c3113449d664a784ce | |
| parent | 52f76cb81e18f164b4b69e93ba7e8f2262518f66 (diff) | |
| parent | 12ae093695ff86530fffdecebcc012a7d8f4a30a (diff) | |
| download | libultrahdr-be91e199aec3c67f8a4a0263d6b97d353896c94c.tar.gz | |
Enable android build targets am: 12ae093695
Original change: https://android-review.googlesource.com/c/platform/external/libultrahdr/+/2850375
Change-Id: I0a6614cb0dea6c20607c105a245ab8efffd15a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | adobe-hdr-gain-map-license/Android.bp | 2 | ||||
| -rw-r--r-- | benchmark/Android.bp | 1 | ||||
| -rw-r--r-- | examples/Android.bp | 1 | ||||
| -rw-r--r-- | fuzzer/Android.bp | 9 | ||||
| -rw-r--r-- | tests/Android.bp | 3 |
6 files changed, 8 insertions, 17 deletions
@@ -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", |