From 254d753f3476c76e861dfa089deba5d563c90582 Mon Sep 17 00:00:00 2001 From: Marissa Wall Date: Fri, 28 Feb 2020 10:51:56 -0800 Subject: [PATCH] libadf: delete libadf & libadfhwc libadf is a helper library for adf (android display framework) kernel drivers. The last Android Common Kernel to support adf was 4.4. Delete this helper library since we do not support any kernels that can use it. If a vendor needs this library, they can fork it. If you have any concerns, please contact adelva@google.com. Bug: 150467766 Test: Compiles Change-Id: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255 Merged-In: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255 --- deprecated-adf/OWNERS | 2 - deprecated-adf/libadf/Android.bp | 26 - deprecated-adf/libadf/adf.cpp | 746 ------------------ deprecated-adf/libadf/include/adf/adf.h | 295 ------- deprecated-adf/libadf/include/video/adf.h | 209 ----- .../original-kernel-headers/video/adf.h | 386 --------- deprecated-adf/libadf/tests/Android.bp | 23 - deprecated-adf/libadf/tests/adf_test.cpp | 403 ---------- deprecated-adf/libadfhwc/Android.bp | 29 - deprecated-adf/libadfhwc/adfhwc.cpp | 376 --------- .../libadfhwc/include/adfhwc/adfhwc.h | 140 ---- 11 files changed, 2635 deletions(-) delete mode 100644 deprecated-adf/OWNERS delete mode 100644 deprecated-adf/libadf/Android.bp delete mode 100644 deprecated-adf/libadf/adf.cpp delete mode 100644 deprecated-adf/libadf/include/adf/adf.h delete mode 100644 deprecated-adf/libadf/include/video/adf.h delete mode 100644 deprecated-adf/libadf/original-kernel-headers/video/adf.h delete mode 100644 deprecated-adf/libadf/tests/Android.bp delete mode 100644 deprecated-adf/libadf/tests/adf_test.cpp delete mode 100644 deprecated-adf/libadfhwc/Android.bp delete mode 100644 deprecated-adf/libadfhwc/adfhwc.cpp delete mode 100644 deprecated-adf/libadfhwc/include/adfhwc/adfhwc.h diff --git a/deprecated-adf/OWNERS b/deprecated-adf/OWNERS deleted file mode 100644 index 72b8b5a47..000000000 --- a/deprecated-adf/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -ghackmann@google.com -marissaw@google.com diff --git a/deprecated-adf/libadf/Android.bp b/deprecated-adf/libadf/Android.bp deleted file mode 100644 index 70f0a3ba0..000000000 --- a/deprecated-adf/libadf/Android.bp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2013 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. - -cc_library { - name: "libadf", - recovery_available: true, - vendor_available: true, - vndk: { - enabled: true, - }, - srcs: ["adf.cpp"], - cflags: ["-Werror"], - local_include_dirs: ["include"], - export_include_dirs: ["include"], -} diff --git a/deprecated-adf/libadf/adf.cpp b/deprecated-adf/libadf/adf.cpp deleted file mode 100644 index fd9c20895..000000000 --- a/deprecated-adf/libadf/adf.cpp +++ /dev/null @@ -1,746 +0,0 @@ -/* - * Copyright (C) 2013 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -#include - -#include - -#define ADF_BASE_PATH "/dev/" - -static ssize_t adf_id_vector_to_array(const std::vector &in, - adf_id_t **out) -{ - auto size = sizeof(in[0]) * in.size(); - // We can't use new[] since the existing API says the caller should free() - // the returned array - auto ret = static_cast(malloc(size)); - if (!ret) - return -ENOMEM; - - std::copy(in.begin(), in.end(), ret); - *out = ret; - return in.size(); -} - -static ssize_t adf_find_nodes(const char *pattern, adf_id_t **ids_out) -{ - struct dirent *dirent; - std::unique_ptr - dir{opendir(ADF_BASE_PATH), closedir}; - if (!dir) - return -errno; - - std::vector ids; - errno = 0; - while ((dirent = readdir(dir.get()))) { - adf_id_t id; - int matched = sscanf(dirent->d_name, pattern, &id); - - if (matched < 0) - return -errno; - else if (matched == 1) - ids.push_back(id); - } - if (errno) - return -errno; - - return adf_id_vector_to_array(ids, ids_out); -} - -ssize_t adf_devices(adf_id_t **ids) -{ - return adf_find_nodes("adf%u", ids); -} - -int adf_device_open(adf_id_t id, int flags, struct adf_device *dev) -{ - char filename[64]; - - dev->id = id; - - snprintf(filename, sizeof(filename), ADF_BASE_PATH "adf%u", id); - dev->fd = open(filename, flags); - if (dev->fd < 0) - return -errno; - - return 0; -} - -void adf_device_close(struct adf_device *dev) -{ - if (dev->fd >= 0) - close(dev->fd); -} - -int adf_get_device_data(struct adf_device *dev, struct adf_device_data *data) -{ - int err; - int ret = 0; - - memset(data, 0, sizeof(*data)); - - err = ioctl(dev->fd, ADF_GET_DEVICE_DATA, data); - if (err < 0) - return -ENOMEM; - - if (data->n_attachments) - data->attachments = new adf_attachment_config[data->n_attachments]; - - if (data->n_allowed_attachments) - data->allowed_attachments = - new adf_attachment_config[data->n_allowed_attachments]; - - if (data->custom_data_size) - data->custom_data = new char[data->custom_data_size]; - - err = ioctl(dev->fd, ADF_GET_DEVICE_DATA, data); - if (err < 0) { - ret = -errno; - adf_free_device_data(data); - } - return ret; -} - -void adf_free_device_data(struct adf_device_data *data) -{ - delete [] data->attachments; - data->attachments = nullptr; - delete [] data->allowed_attachments; - data->allowed_attachments = nullptr; - delete [] static_cast(data->custom_data); - data->custom_data = nullptr; -} - -int adf_device_post(struct adf_device *dev, - adf_id_t *interfaces, size_t n_interfaces, - struct adf_buffer_config *bufs, size_t n_bufs, - void *custom_data, size_t custom_data_size) -{ - int err; - struct adf_post_config data; - - memset(&data, 0, sizeof(data)); - data.interfaces = interfaces; - data.n_interfaces = n_interfaces; - data.bufs = bufs; - data.n_bufs = n_bufs; - data.custom_data = custom_data; - data.custom_data_size = custom_data_size; - - err = ioctl(dev->fd, ADF_POST_CONFIG, &data); - if (err < 0) - return -errno; - - return (int)data.complete_fence; -} - -int adf_device_post_v2(struct adf_device *dev, - adf_id_t *interfaces, __u32 n_interfaces, - struct adf_buffer_config *bufs, __u32 n_bufs, - void *custom_data, __u64 custom_data_size, - enum adf_complete_fence_type complete_fence_type, - int *complete_fence) -{ - int err; - struct adf_post_config_v2 data; - - memset(&data, 0, sizeof(data)); - data.interfaces = (uintptr_t)interfaces; - data.n_interfaces = n_interfaces; - data.bufs = (uintptr_t)bufs; - data.n_bufs = n_bufs; - data.custom_data = (uintptr_t)custom_data; - data.custom_data_size = custom_data_size; - data.complete_fence_type = complete_fence_type; - - err = ioctl(dev->fd, ADF_POST_CONFIG_V2, &data); - if (err < 0) - return -errno; - - if (complete_fence) - *complete_fence = data.complete_fence; - else if (data.complete_fence >= 0) - close(data.complete_fence); - - return 0; -} - -static int adf_device_attachment(struct adf_device *dev, - adf_id_t overlay_engine, adf_id_t interface, bool attach) -{ - int err; - struct adf_attachment_config data; - - memset(&data, 0, sizeof(data)); - data.overlay_engine = overlay_engine; - data.interface = interface; - - err = ioctl(dev->fd, attach ? ADF_ATTACH : ADF_DETACH, &data); - if (err < 0) - return -errno; - - return 0; -} - -int adf_device_attach(struct adf_device *dev, adf_id_t overlay_engine, - adf_id_t interface) -{ - return adf_device_attachment(dev, overlay_engine, interface, true); -} - -int adf_device_detach(struct adf_device *dev, adf_id_t overlay_engine, - adf_id_t interface) -{ - return adf_device_attachment(dev, overlay_engine, interface, false); -} - -ssize_t adf_interfaces(struct adf_device *dev, adf_id_t **interfaces) -{ - char pattern[64]; - - snprintf(pattern, sizeof(pattern), "adf-interface%u.%%u", dev->id); - return adf_find_nodes(pattern, interfaces); -} - -ssize_t adf_interfaces_for_overlay_engine(struct adf_device *dev, - adf_id_t overlay_engine, adf_id_t **interfaces) -{ - struct adf_device_data data; - auto err = adf_get_device_data(dev, &data); - if (err < 0) - return err; - - std::vector ids; - if (data.allowed_attachments != nullptr) - for (size_t i = 0; i < data.n_allowed_attachments; i++) - if (data.allowed_attachments[i].overlay_engine == overlay_engine) - ids.push_back(data.allowed_attachments[i].interface); - - adf_free_device_data(&data); - return adf_id_vector_to_array(ids, interfaces); -} - -static ssize_t adf_interfaces_filter(struct adf_device *dev, - adf_id_t *in, size_t n_in, adf_id_t **out, - bool (*filter)(struct adf_interface_data *data, __u32 match), - __u32 match) -{ - std::vector ids; - for (size_t i = 0; i < n_in; i++) { - int fd = adf_interface_open(dev, in[i], O_RDONLY); - if (fd < 0) - return fd; - - struct adf_interface_data data; - auto ret = adf_get_interface_data(fd, &data); - close(fd); - if (ret < 0) - return ret; - - if (filter(&data, match)) - ids.push_back(in[i]); - } - - return adf_id_vector_to_array(ids, out); -} - -static bool adf_interface_type_filter(struct adf_interface_data *data, - __u32 type) -{ - return data->type == (enum adf_interface_type)type; -} - -ssize_t adf_interfaces_filter_by_type(struct adf_device *dev, - enum adf_interface_type type, - adf_id_t *in, size_t n_in, adf_id_t **out) -{ - return adf_interfaces_filter(dev, in, n_in, out, adf_interface_type_filter, - type); -} - -static bool adf_interface_flags_filter(struct adf_interface_data *data, - __u32 flag) -{ - return !!(data->flags & flag); -} - -ssize_t adf_interfaces_filter_by_flag(struct adf_device *dev, __u32 flag, - adf_id_t *in, size_t n_in, adf_id_t **out) -{ - return adf_interfaces_filter(dev, in, n_in, out, adf_interface_flags_filter, - flag); -} - -int adf_interface_open(struct adf_device *dev, adf_id_t id, int flags) -{ - char filename[64]; - - snprintf(filename, sizeof(filename), ADF_BASE_PATH "adf-interface%u.%u", - dev->id, id); - - int fd = open(filename, flags); - if (fd < 0) - return -errno; - return fd; -} - -int adf_get_interface_data(int fd, struct adf_interface_data *data) -{ - int err; - int ret = 0; - - memset(data, 0, sizeof(*data)); - - err = ioctl(fd, ADF_GET_INTERFACE_DATA, data); - if (err < 0) - return -errno; - - if (data->n_available_modes) - data->available_modes = new drm_mode_modeinfo[data->n_available_modes]; - - if (data->custom_data_size) - data->custom_data = new char[data->custom_data_size]; - - err = ioctl(fd, ADF_GET_INTERFACE_DATA, data); - if (err < 0) { - ret = -errno; - adf_free_interface_data(data); - } - return ret; -} - -void adf_free_interface_data(struct adf_interface_data *data) -{ - delete [] data->available_modes; - delete [] static_cast(data->custom_data); -} - -int adf_interface_blank(int fd, __u8 mode) -{ - int err = ioctl(fd, ADF_BLANK, mode); - if (err < 0) - return -errno; - return 0; -} - -int adf_interface_set_mode(int fd, struct drm_mode_modeinfo *mode) -{ - int err = ioctl(fd, ADF_SET_MODE, mode); - if (err < 0) - return -errno; - return 0; -} - -int adf_interface_simple_buffer_alloc(int fd, __u32 w, __u32 h, - __u32 format, __u32 *offset, __u32 *pitch) -{ - int err; - struct adf_simple_buffer_alloc data; - - memset(&data, 0, sizeof(data)); - data.w = w; - data.h = h; - data.format = format; - - err = ioctl(fd, ADF_SIMPLE_BUFFER_ALLOC, &data); - if (err < 0) - return -errno; - - *offset = data.offset; - *pitch = data.pitch; - return (int)data.fd; -} - -static void adf_interface_simple_post_config_buf(struct adf_buffer_config *buf, - __u32 overlay_engine, __u32 w, __u32 h, __u32 format, int buf_fd, - __u32 offset, __u32 pitch, int acquire_fence) -{ - buf->overlay_engine = overlay_engine; - buf->w = w; - buf->h = h; - buf->format = format; - buf->fd[0] = buf_fd; - buf->offset[0] = offset; - buf->pitch[0] = pitch; - buf->n_planes = 1; - buf->acquire_fence = acquire_fence; -} - -int adf_interface_simple_post(int fd, __u32 overlay_engine, - __u32 w, __u32 h, __u32 format, int buf_fd, __u32 offset, - __u32 pitch, int acquire_fence) -{ - int ret; - struct adf_simple_post_config data; - - memset(&data, 0, sizeof(data)); - adf_interface_simple_post_config_buf(&data.buf, overlay_engine, w, h, format, - buf_fd, offset, pitch, acquire_fence); - ret = ioctl(fd, ADF_SIMPLE_POST_CONFIG, &data); - if (ret < 0) - return -errno; - - return (int)data.complete_fence; -} - -int adf_interface_simple_post_v2(int fd, adf_id_t overlay_engine, - __u32 w, __u32 h, __u32 format, int buf_fd, __u32 offset, - __u32 pitch, int acquire_fence, - enum adf_complete_fence_type complete_fence_type, - int *complete_fence) -{ - int ret; - struct adf_simple_post_config_v2 data; - - memset(&data, 0, sizeof(data)); - adf_interface_simple_post_config_buf(&data.buf, overlay_engine, w, h, format, - buf_fd, offset, pitch, acquire_fence); - data.complete_fence_type = complete_fence_type; - - ret = ioctl(fd, ADF_SIMPLE_POST_CONFIG_V2, &data); - if (ret < 0) - return -errno; - - if (complete_fence) - *complete_fence = data.complete_fence; - else if (data.complete_fence >= 0) - close(data.complete_fence); - - return 0; -} - -ssize_t adf_overlay_engines(struct adf_device *dev, adf_id_t **overlay_engines) -{ - char pattern[64]; - - snprintf(pattern, sizeof(pattern), "adf-overlay-engine%u.%%u", dev->id); - return adf_find_nodes(pattern, overlay_engines); -} - -ssize_t adf_overlay_engines_for_interface(struct adf_device *dev, - adf_id_t interface, adf_id_t **overlay_engines) -{ - struct adf_device_data data; - auto err = adf_get_device_data(dev, &data); - if (err < 0) - return err; - - std::vector ids; - if (data.allowed_attachments != nullptr) - for (size_t i = 0; i < data.n_allowed_attachments; i++) - if (data.allowed_attachments[i].interface == interface) - ids.push_back(data.allowed_attachments[i].overlay_engine); - - return adf_id_vector_to_array(ids, overlay_engines); -} - -static ssize_t adf_overlay_engines_filter(struct adf_device *dev, - adf_id_t *in, size_t n_in, adf_id_t **out, - bool (*filter)(struct adf_overlay_engine_data *data, void *cookie), - void *cookie) -{ - std::vector ids; - size_t i; - for (i = 0; i < n_in; i++) { - int fd = adf_overlay_engine_open(dev, in[i], O_RDONLY); - if (fd < 0) - return fd; - - struct adf_overlay_engine_data data; - auto ret = adf_get_overlay_engine_data(fd, &data); - close(fd); - if (ret < 0) - return ret; - - if (filter(&data, cookie)) - ids.push_back(in[i]); - } - - return adf_id_vector_to_array(ids, out); -} - -struct format_filter_cookie { - const __u32 *formats; - size_t n_formats; -}; - -static bool adf_overlay_engine_format_filter( - struct adf_overlay_engine_data *data, void *cookie) -{ - auto c = static_cast(cookie); - size_t i; - for (i = 0; i < data->n_supported_formats; i++) { - size_t j; - for (j = 0; j < c->n_formats; j++) - if (data->supported_formats[i] == c->formats[j]) - return true; - } - return false; -} - -ssize_t adf_overlay_engines_filter_by_format(struct adf_device *dev, - const __u32 *formats, size_t n_formats, adf_id_t *in, size_t n_in, - adf_id_t **out) -{ - struct format_filter_cookie cookie = { formats, n_formats }; - return adf_overlay_engines_filter(dev, in, n_in, out, - adf_overlay_engine_format_filter, &cookie); -} - -int adf_overlay_engine_open(struct adf_device *dev, adf_id_t id, int flags) -{ - char filename[64]; - - snprintf(filename, sizeof(filename), - ADF_BASE_PATH "adf-overlay-engine%u.%u", dev->id, id); - - int fd = open(filename, flags); - if (fd < 0) - return -errno; - return fd; -} - -int adf_get_overlay_engine_data(int fd, struct adf_overlay_engine_data *data) -{ - int err; - int ret = 0; - - memset(data, 0, sizeof(*data)); - - err = ioctl(fd, ADF_GET_OVERLAY_ENGINE_DATA, data); - if (err < 0) - return -errno; - - if (data->n_supported_formats) - data->supported_formats = new __u32[data->n_supported_formats]; - - if (data->custom_data_size) - data->custom_data = new char[data->custom_data_size]; - - err = ioctl(fd, ADF_GET_OVERLAY_ENGINE_DATA, data); - if (err < 0) { - ret = -errno; - adf_free_overlay_engine_data(data); - } - return ret; -} - -void adf_free_overlay_engine_data(struct adf_overlay_engine_data *data) -{ - delete [] data->supported_formats; - data->supported_formats = nullptr; - delete [] static_cast(data->custom_data); - data->custom_data = nullptr; -} - -bool adf_overlay_engine_supports_format(int fd, __u32 format) -{ - struct adf_overlay_engine_data data; - bool ret = false; - size_t i; - - int err = adf_get_overlay_engine_data(fd, &data); - if (err < 0) - return false; - - if (data.supported_formats != nullptr) { - for (i = 0; i < data.n_supported_formats; i++) { - if (data.supported_formats[i] == format) { - ret = true; - break; - } - } - } - - adf_free_overlay_engine_data(&data); - return ret; -} - -int adf_set_event(int fd, enum adf_event_type type, bool enabled) -{ - struct adf_set_event data; - - data.type = type; - data.enabled = enabled; - - int err = ioctl(fd, ADF_SET_EVENT, &data); - if (err < 0) - return -errno; - return 0; -} - -int adf_read_event(int fd, struct adf_event **event) -{ - struct adf_event header; - struct event_with_data { - struct adf_event base; - uint8_t data[0]; - }; - using unique_event = std::unique_ptr; - size_t data_size; - - int err = read(fd, &header, sizeof(header)); - if (err < 0) - return -errno; - if ((size_t)err < sizeof(header)) - return -EIO; - if (header.length < sizeof(header)) - return -EIO; - - // Again, we can't use new[] since the existing API says the caller should - // free() the returned event - auto event_ptr = static_cast(malloc(header.length)); - unique_event event_ret{event_ptr, free}; - if (!event_ret) - return -ENOMEM; - data_size = header.length - sizeof(header); - - memcpy(event_ret.get(), &header, sizeof(header)); - ssize_t read_size = read(fd, &event_ret->data, data_size); - if (read_size < 0) - return -errno; - if ((size_t)read_size < data_size) - return -EIO; - - *event = &event_ret.release()->base; - return 0; -} - -void adf_format_str(__u32 format, char buf[ADF_FORMAT_STR_SIZE]) -{ - buf[0] = format & 0xFF; - buf[1] = (format >> 8) & 0xFF; - buf[2] = (format >> 16) & 0xFF; - buf[3] = (format >> 24) & 0xFF; - buf[4] = '\0'; -} - -static bool adf_find_simple_post_overlay_engine(struct adf_device *dev, - const __u32 *formats, size_t n_formats, - adf_id_t interface, adf_id_t *overlay_engine) -{ - adf_id_t *engs = nullptr; - ssize_t n_engs = adf_overlay_engines_for_interface(dev, interface, &engs); - - if (engs == nullptr) - return false; - - adf_id_t *filtered_engs = nullptr; - ssize_t n_filtered_engs = adf_overlay_engines_filter_by_format(dev, - formats, n_formats, engs, n_engs, &filtered_engs); - free(engs); - - if (filtered_engs == nullptr) - return false; - - *overlay_engine = filtered_engs[0]; - free(filtered_engs); - return true; -} - -static const __u32 any_rgb_format[] = { - DRM_FORMAT_C8, - DRM_FORMAT_RGB332, - DRM_FORMAT_BGR233, - DRM_FORMAT_XRGB1555, - DRM_FORMAT_XBGR1555, - DRM_FORMAT_RGBX5551, - DRM_FORMAT_BGRX5551, - DRM_FORMAT_ARGB1555, - DRM_FORMAT_ABGR1555, - DRM_FORMAT_RGBA5551, - DRM_FORMAT_BGRA5551, - DRM_FORMAT_RGB565, - DRM_FORMAT_BGR565, - DRM_FORMAT_RGB888, - DRM_FORMAT_BGR888, - DRM_FORMAT_XRGB8888, - DRM_FORMAT_XBGR8888, - DRM_FORMAT_RGBX8888, - DRM_FORMAT_BGRX8888, - DRM_FORMAT_XRGB2101010, - DRM_FORMAT_XBGR2101010, - DRM_FORMAT_RGBX1010102, - DRM_FORMAT_BGRX1010102, - DRM_FORMAT_ARGB2101010, - DRM_FORMAT_ABGR2101010, - DRM_FORMAT_RGBA1010102, - DRM_FORMAT_BGRA1010102, - DRM_FORMAT_ARGB8888, - DRM_FORMAT_ABGR8888, - DRM_FORMAT_RGBA8888, - DRM_FORMAT_BGRA8888, -}; - -int adf_find_simple_post_configuration(struct adf_device *dev, - const __u32 *formats, size_t n_formats, - adf_id_t *interface, adf_id_t *overlay_engine) -{ - adf_id_t *intfs = NULL; - ssize_t n_intfs = adf_interfaces(dev, &intfs); - - if (n_intfs < 0) - return n_intfs; - else if (!intfs) - return -ENODEV; - - adf_id_t *primary_intfs = nullptr; - ssize_t n_primary_intfs = adf_interfaces_filter_by_flag(dev, - ADF_INTF_FLAG_PRIMARY, intfs, n_intfs, &primary_intfs); - free(intfs); - - if (n_primary_intfs < 0) - return n_primary_intfs; - else if (!primary_intfs) - return -ENODEV; - - if (!formats) { - formats = any_rgb_format; - n_formats = sizeof(any_rgb_format) / sizeof(any_rgb_format[0]); - } - - bool found = false; - ssize_t i = 0; - for (i = 0; i < n_primary_intfs; i++) { - found = adf_find_simple_post_overlay_engine(dev, formats, n_formats, - primary_intfs[i], overlay_engine); - if (found) { - *interface = primary_intfs[i]; - break; - } - } - free(primary_intfs); - - if (!found) - return -ENODEV; - - return 0; -} diff --git a/deprecated-adf/libadf/include/adf/adf.h b/deprecated-adf/libadf/include/adf/adf.h deleted file mode 100644 index e4c7b28cc..000000000 --- a/deprecated-adf/libadf/include/adf/adf.h +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (C) 2013 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. - */ - -#ifndef _LIBADF_ADF_H_ -#define _LIBADF_ADF_H_ - -#include -#include -#include -#include -#include