Snap for 10453563 from 255a0cbc4a18f900d39b15fdbb7d291fbc5f6a78 to mainline-permission-releaseaml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release

Change-Id: I52eed6702dea227f7de3b96b3015ff259973ebc4

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,
+}
diff --git a/OWNERS b/OWNERS
index 50ee2c8..a2f3cfb 100644
--- a/OWNERS
+++ b/OWNERS
@@ -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
diff --git a/malloc.c b/dlmalloc.c
index a61c0da..a61c0da 100644
--- a/malloc.c
+++ b/dlmalloc.c
diff --git a/malloc.h b/dlmalloc.h
index e52c9e5..e52c9e5 100644
--- a/malloc.h
+++ b/dlmalloc.h