diff options
| author | DichenZhang1 <140119224+DichenZhang1@users.noreply.github.com> | 2023-11-28 12:03:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 12:03:24 -0800 |
| commit | bbe26c29076c0d903a3abbf9204228891487839d (patch) | |
| tree | a4605eb3c4b7b3aac1ff736adb881150a86c6a0a | |
| parent | 3a3a752a5da0b2304b1b6de0ef383bbe41256a67 (diff) | |
| parent | 26c29dc60d80943f54f05ff012f68b35a99d4efb (diff) | |
| download | libultrahdr-bbe26c29076c0d903a3abbf9204228891487839d.tar.gz | |
Merge pull request #46 from ittiam-systems/disable-android
Temporarily disable Android targets
| -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 | 1 |
6 files changed, 16 insertions, 7 deletions
@@ -32,7 +32,8 @@ license { } cc_library { - name: "libultrahdr", + name: "libultrahdr-new", + enabled: false, host_supported: true, vendor_available: true, export_include_dirs: ["lib"], @@ -56,7 +57,8 @@ cc_library { } cc_library { - name: "libjpegencoder", + name: "libjpegencoder-new", + enabled: false, host_supported: true, vendor_available: true, @@ -73,7 +75,8 @@ cc_library { } cc_library { - name: "libjpegdecoder", + name: "libjpegdecoder-new", + enabled: false, 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 e999a8b..9cff26f 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", + name: "adobe_hdr_gain_map_license-new", license_kinds: ["legacy_by_exception_only"], license_text: ["NOTICE"], } diff --git a/benchmark/Android.bp b/benchmark/Android.bp index 1dc6ccf..0764437 100644 --- a/benchmark/Android.bp +++ b/benchmark/Android.bp @@ -23,6 +23,7 @@ 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 0ede18b..9591e03 100644 --- a/examples/Android.bp +++ b/examples/Android.bp @@ -38,4 +38,5 @@ cc_binary { "libjpegencoder", "libultrahdr", ], + enabled: false, } diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp index b366fd8..0c14bf7 100644 --- a/fuzzer/Android.bp +++ b/fuzzer/Android.bp @@ -22,7 +22,8 @@ package { } cc_defaults { - name: "ultrahdr_fuzzer_defaults", + name: "ultrahdr_fuzzer_defaults-new", + enabled: false, host_supported: true, shared_libs: [ "libimage_io", @@ -52,7 +53,8 @@ cc_defaults { } cc_fuzz { - name: "ultrahdr_enc_fuzzer", + name: "ultrahdr_enc_fuzzer-new", + enabled: false, defaults: ["ultrahdr_fuzzer_defaults"], srcs: [ "ultrahdr_enc_fuzzer.cpp", @@ -60,7 +62,8 @@ cc_fuzz { } cc_fuzz { - name: "ultrahdr_dec_fuzzer", + name: "ultrahdr_dec_fuzzer-new", + enabled: false, defaults: ["ultrahdr_fuzzer_defaults"], srcs: [ "ultrahdr_dec_fuzzer.cpp", diff --git a/tests/Android.bp b/tests/Android.bp index 8fe1621..6b6a54f 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -23,6 +23,7 @@ package { cc_test { name: "ultrahdr_unit_test", + enabled: false, test_suites: ["device-tests"], srcs: [ "gainmapmath_test.cpp", |