Remove unused files

conscrypt and neuralnetworks namespaces are now generated automatically.

Bug: N/A
Test: build
Change-Id: Ic13d3f4206ecfda1937adf2111977b279fba05ef

diff --git a/contents/namespace/conscrypt.cc b/contents/namespace/conscrypt.cc
deleted file mode 100644 (file)
index da1df16..0000000
--- a/contents/namespace/conscrypt.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-// This namespace is for libraries within the conscrypt APEX.
-// Keep in sync with the "conscrypt" namespace in art/build/apex/ld.config.txt.
-
-#include "linkerconfig/namespacebuilder.h"
-
-#include <string>
-#include <vector>
-
-using android::linkerconfig::modules::AsanPath;
-using android::linkerconfig::modules::Namespace;
-
-namespace android {
-namespace linkerconfig {
-namespace contents {
-Namespace BuildConscryptNamespace([[maybe_unused]] const Context& ctx) {
-  Namespace ns("conscrypt",
-               /*is_isolated=*/true,
-               /*is_visible=*/true);
-
-  ns.AddSearchPath("/apex/com.android.conscrypt/${LIB}", AsanPath::SAME_PATH);
-  ns.AddPermittedPath("/system/${LIB}");
-  ns.AddRequires(std::vector{
-      "libandroidio.so",
-      "libc.so",
-      "libdl.so",
-      "liblog.so",
-      "libm.so",
-  });
-
-  return ns;
-}
-}  // namespace contents
-}  // namespace linkerconfig
-}  // namespace android

diff --git a/contents/namespace/neuralnetworks.cc b/contents/namespace/neuralnetworks.cc
deleted file mode 100644 (file)
index 5e9a56f..0000000
--- a/contents/namespace/neuralnetworks.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-// This namespace is for libraries within the NNAPI APEX.
-
-#include "linkerconfig/namespacebuilder.h"
-
-#include "linkerconfig/namespace.h"
-
-using android::linkerconfig::modules::AsanPath;
-using android::linkerconfig::modules::Namespace;
-
-namespace android {
-namespace linkerconfig {
-namespace contents {
-Namespace BuildNeuralNetworksNamespace([[maybe_unused]] const Context& ctx) {
-  Namespace ns("neuralnetworks", /*is_isolated=*/true, /*is_visible=*/true);
-  ns.AddSearchPath("/apex/com.android.neuralnetworks/${LIB}",
-                   AsanPath::SAME_PATH);
-  ns.AddPermittedPath("/system/${LIB}");
-  ns.AddProvides(std::vector{
-      "libneuralnetworks.so",
-  });
-  ns.AddRequires(std::vector{
-      "libc.so",
-      "libcgrouprc.so",
-      "libdl.so",
-      "liblog.so",
-      "libm.so",
-      "libnativewindow.so",
-      "libneuralnetworks_packageinfo.so",
-      "libvndksupport.so",
-  });
-
-  return ns;
-}
-}  // namespace contents
-}  // namespace linkerconfig
-}  // namespace android