diff options
author | Stefano Cianciulli <scianciulli@google.com> | 2022-07-01 14:07:31 +0000 |
---|---|---|
committer | Stefano Cianciulli <scianciulli@google.com> | 2022-07-06 09:50:20 +0000 |
commit | b6c347060235ed8617039bd12eeecd3091eaf3be (patch) | |
tree | 5b61977365c9dc1d8aa782852fde63cc002abf1b | |
parent | ec96486d81952c9c07dde5ea477ef33e37c521e5 (diff) | |
download | dlmalloc-b6c347060235ed8617039bd12eeecd3091eaf3be.tar.gz |
Declare dlmalloc as a cc_library_headers
This change is needed so dlmalloc can be included into libart
(art/runtime/gc/allocator/art-dlmalloc.{h, cc}) through the
include directory (rather than via a direct relative path
inclusion, as it is at the moment).
Bug: 236243696
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: Ic6f84404a27b0ad93e161e6bd080331d0c6d6439
-rw-r--r-- | Android.bp | 47 | ||||
-rw-r--r-- | OWNERS | 2 | ||||
-rw-r--r-- | dlmalloc.c (renamed from malloc.c) | 0 | ||||
-rw-r--r-- | dlmalloc.h (renamed from malloc.h) | 0 |
4 files changed, 48 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..971b513 --- /dev/null +++ b/Android.bp @@ -0,0 +1,47 @@ +// +// Copyright (C) 2022 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_dlmalloc_license"], +} + + +license { + name: "external_dlmalloc_license", + visibility: [":__subpackages__"], + license_kinds: ["legacy_unencumbered"], + license_text: ["NOTICE"], +} + +// In an ideal world, dlmalloc should be declared as a cc_static_library and +// linked against libart, but at the moment dlmalloc.c (the source file) is +// included directly in art/runtime/gc/allocator/art-dlmalloc.cc, and that is +// made possible by this declaration of dlmalloc as cc_library_headers. +// +// TODO: Find a better solution to make dlmalloc be linked against libart +// without the current dlmalloc.c source inclusion. +cc_library_headers { + name: "dlmalloc", + host_supported: true, + export_include_dirs: ["."], + apex_available: [ + "com.android.art", + "com.android.art.debug", + "//apex_available:platform", + ], + min_sdk_version: "apex_inherit", + tidy: false, +} @@ -1,3 +1,3 @@ # Default code reviewers picked from top 3 or more developers. # Please update this list if you find better candidates. -mathieuc@google.com +include platform/art:/OWNERS |