Revert "Create empty section for fuzz tests"
This reverts commit 0e550521745228f06c68be8a71bf68acc51dd772.
Reason for revert: Causing infrastructure outages since fuzzers cannot run
Bug: 328639808
Change-Id: Ia6492925dd4198e193e3535f6195682d06bae60d
diff --git a/contents/configuration/baseconfig.cc b/contents/configuration/baseconfig.cc
index 7f6a9c8..d29eaee 100644
--- a/contents/configuration/baseconfig.cc
+++ b/contents/configuration/baseconfig.cc
@@ -84,8 +84,6 @@
// above. Then clean this up.
{"/data/local/tmp", "unrestricted"},
- {"/data/fuzz", "fuzz"},
-
{"/postinstall", "postinstall"},
// Fallback entry to provide APEX namespace lookups for binaries anywhere
// else. This must be last.
@@ -109,8 +107,6 @@
sections.emplace_back(BuildIsolatedSection(ctx));
- sections.emplace_back(BuildFuzzSection(ctx));
-
return android::linkerconfig::modules::Configuration(std::move(sections),
std::move(dirToSection));
}
diff --git a/contents/include/linkerconfig/namespacebuilder.h b/contents/include/linkerconfig/namespacebuilder.h
index 914e2fc..1725ac4 100644
--- a/contents/include/linkerconfig/namespacebuilder.h
+++ b/contents/include/linkerconfig/namespacebuilder.h
@@ -37,7 +37,6 @@
NamespaceBuilder BuildPostInstallNamespace;
NamespaceBuilder BuildRecoveryDefaultNamespace;
NamespaceBuilder BuildIsolatedDefaultNamespace;
-NamespaceBuilder BuildFuzzDefaultNamespace;
modules::Namespace BuildVendorNamespace(const Context& ctx,
const std::string& name);
diff --git a/contents/include/linkerconfig/sectionbuilder.h b/contents/include/linkerconfig/sectionbuilder.h
index a1ee304..40010b8 100644
--- a/contents/include/linkerconfig/sectionbuilder.h
+++ b/contents/include/linkerconfig/sectionbuilder.h
@@ -48,7 +48,6 @@
SectionBuilder BuildRecoverySection;
SectionBuilder BuildIsolatedSection;
ApexSectionBuilder BuildApexDefaultSection;
-SectionBuilder BuildFuzzSection;
std::vector<modules::LibProvider> GetVndkProvider(const Context& ctx,
VndkUserPartition partition);
diff --git a/contents/namespace/fuzzdefault.cc b/contents/namespace/fuzzdefault.cc
deleted file mode 100644
index 4bd7a76..0000000
--- a/contents/namespace/fuzzdefault.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2024 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 "linkerconfig/namespacebuilder.h"
-
-#include <vector>
-
-#include "linkerconfig/namespace.h"
-
-using android::linkerconfig::modules::Namespace;
-
-namespace android {
-namespace linkerconfig {
-namespace contents {
-Namespace BuildFuzzDefaultNamespace([[maybe_unused]] const Context& ctx) {
- Namespace ns("default", /*is_isolated=*/true, /*is_visible=*/false);
-
- // TODO(b/317924926) Create search path based on target architecture
- ns.AddSearchPath("/data/fuzz/arm/lib");
- ns.AddSearchPath("/data/fuzz/arm64/lib");
- ns.AddSearchPath("/data/fuzz/x86/lib");
- ns.AddSearchPath("/data/fuzz/x86_64/lib");
- ns.AddSearchPath("/data/fuzz/riscv64/lib");
-
- return ns;
-}
-} // namespace contents
-} // namespace linkerconfig
-} // namespace android
diff --git a/contents/section/fuzz.cc b/contents/section/fuzz.cc
deleted file mode 100644
index 47b968d..0000000
--- a/contents/section/fuzz.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2024 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 "linkerconfig/sectionbuilder.h"
-
-#include <vector>
-
-#include "linkerconfig/common.h"
-#include "linkerconfig/namespace.h"
-#include "linkerconfig/namespacebuilder.h"
-#include "linkerconfig/section.h"
-
-using android::linkerconfig::contents::SectionType;
-using android::linkerconfig::modules::Namespace;
-using android::linkerconfig::modules::Section;
-
-namespace android {
-namespace linkerconfig {
-namespace contents {
-
-Section BuildFuzzSection(Context& ctx) {
- ctx.SetCurrentSection(SectionType::Other);
- std::vector<Namespace> namespaces;
- namespaces.emplace_back(BuildFuzzDefaultNamespace(ctx));
- Section section("fuzz", std::move(namespaces));
-
- return section;
-}
-
-} // namespace contents
-} // namespace linkerconfig
-} // namespace android
\ No newline at end of file
diff --git a/testdata/golden_output/deprecate_product_vndk/ld.config.txt b/testdata/golden_output/deprecate_product_vndk/ld.config.txt
index 8c5637b..48b8295 100644
--- a/testdata/golden_output/deprecate_product_vndk/ld.config.txt
+++ b/testdata/golden_output/deprecate_product_vndk/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -2428,30 +2427,3 @@
namespace.system.link.com_android_resolv.shared_libs = libnetd_resolv.so
namespace.system.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
namespace.system.link.com_android_os_statsd.shared_libs = libstatspull.so:libstatssocket.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
diff --git a/testdata/golden_output/deprecate_vndk/ld.config.txt b/testdata/golden_output/deprecate_vndk/ld.config.txt
index 11ddd72..bf20c2c 100644
--- a/testdata/golden_output/deprecate_vndk/ld.config.txt
+++ b/testdata/golden_output/deprecate_vndk/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -2234,30 +2233,3 @@
namespace.system.link.com_android_resolv.shared_libs = libnetd_resolv.so
namespace.system.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
namespace.system.link.com_android_os_statsd.shared_libs = libstatspull.so:libstatssocket.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
diff --git a/testdata/golden_output/guest/ld.config.txt b/testdata/golden_output/guest/ld.config.txt
index 8230ce1..2e2ccfa 100644
--- a/testdata/golden_output/guest/ld.config.txt
+++ b/testdata/golden_output/guest/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -2468,30 +2467,3 @@
namespace.system.link.com_android_resolv.shared_libs = libnetd_resolv.so
namespace.system.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
namespace.system.link.com_android_os_statsd.shared_libs = libstatspull.so:libstatssocket.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt
index 3a1ccfc..63d646c 100644
--- a/testdata/golden_output/stage1/ld.config.txt
+++ b/testdata/golden_output/stage1/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -1611,30 +1610,3 @@
namespace.system.links = com_android_i18n,com_android_art
namespace.system.link.com_android_i18n.shared_libs = libandroidicu.so:libicu.so:libicui18n.so:libicuuc.so:libpac.so
namespace.system.link.com_android_art.shared_libs = libdexfile.so:libdexfiled.so:libnativebridge.so:libnativehelper.so:libnativeloader.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt
index 8230ce1..2e2ccfa 100644
--- a/testdata/golden_output/stage2/ld.config.txt
+++ b/testdata/golden_output/stage2/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -2468,30 +2467,3 @@
namespace.system.link.com_android_resolv.shared_libs = libnetd_resolv.so
namespace.system.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
namespace.system.link.com_android_os_statsd.shared_libs = libstatspull.so:libstatssocket.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
diff --git a/testdata/golden_output/vndk-in-system/ld.config.txt b/testdata/golden_output/vndk-in-system/ld.config.txt
index 43f6b6a..1e27ac2 100644
--- a/testdata/golden_output/vndk-in-system/ld.config.txt
+++ b/testdata/golden_output/vndk-in-system/ld.config.txt
@@ -20,7 +20,6 @@
dir.unrestricted = /data/local/tests/unrestricted
dir.vendor = /data/local/tests/vendor
dir.unrestricted = /data/local/tmp
-dir.fuzz = /data/fuzz
dir.postinstall = /postinstall
dir.system = /data
dir.system = /product/app/
@@ -2505,30 +2504,3 @@
namespace.system.link.com_android_resolv.shared_libs = libnetd_resolv.so
namespace.system.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so
namespace.system.link.com_android_os_statsd.shared_libs = libstatspull.so:libstatssocket.so
-[fuzz]
-namespace.default.isolated = true
-namespace.default.search.paths = /data/fuzz/arm/lib
-namespace.default.search.paths += /data/fuzz/arm64/lib
-namespace.default.search.paths += /data/fuzz/x86/lib
-namespace.default.search.paths += /data/fuzz/x86_64/lib
-namespace.default.search.paths += /data/fuzz/riscv64/lib
-namespace.default.asan.search.paths = /data/asan/data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/fuzz/arm/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/fuzz/arm64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/fuzz/x86/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.asan.search.paths += /data/asan/data/fuzz/riscv64/lib
-namespace.default.asan.search.paths += /data/fuzz/riscv64/lib
-namespace.default.hwasan.search.paths = /data/fuzz/arm/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm/lib
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/arm64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86/lib
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/x86_64/lib
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib/hwasan
-namespace.default.hwasan.search.paths += /data/fuzz/riscv64/lib
