Remove dex2oat_headers library.
It is now unused.
Test: m
Test: m test-art-host-gtest
Bug: 142946543
Change-Id: Ie11bac19e52a166363ebca231287017997d5409c
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 474dac1..3f83031 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -149,22 +149,6 @@
],
}
-cc_library_headers {
- name: "dex2oat_headers",
- visibility: [
- // TODO(b/133140750): Clean this up.
- "//frameworks/native/cmds/installd",
- ],
- host_supported: true,
- export_include_dirs: ["include"],
-
- apex_available: [
- "//apex_available:platform",
- "com.android.art.release",
- "com.android.art.debug",
- ],
-}
-
cc_defaults {
name: "dex2oat-defaults",
host_supported: true,
@@ -180,7 +164,6 @@
},
},
header_libs: [
- "dex2oat_headers",
"art_cmdlineparser_headers",
],
}
@@ -489,7 +472,6 @@
},
},
- header_libs: ["dex2oat_headers"],
shared_libs: [
"libartbased",
"libartd-compiler",
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index dd6194f..3e0bb88 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -71,7 +71,6 @@
#include "dex/quick_compiler_callbacks.h"
#include "dex/verification_results.h"
#include "dex2oat_options.h"
-#include "dex2oat_return_codes.h"
#include "dexlayout.h"
#include "driver/compiler_driver.h"
#include "driver/compiler_options.h"
@@ -106,6 +105,14 @@
namespace art {
+namespace dex2oat {
+ enum class ReturnCode : int {
+ kNoFailure = 0, // No failure, execution completed successfully.
+ kOther = 1, // Some other not closer specified error occurred.
+ kCreateRuntime = 2, // Dex2oat failed creating a runtime.
+ };
+} // namespace dex2oat
+
using android::base::StringAppendV;
using android::base::StringPrintf;
using gc::space::ImageSpace;
diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc
index 3bb04e1..e131e06 100644
--- a/dex2oat/dex2oat_test.cc
+++ b/dex2oat/dex2oat_test.cc
@@ -43,7 +43,6 @@
#include "dex/dex_file-inl.h"
#include "dex/dex_file_loader.h"
#include "dex2oat_environment_test.h"
-#include "dex2oat_return_codes.h"
#include "gc_root-inl.h"
#include "intern_table-inl.h"
#include "oat.h"
diff --git a/dex2oat/include/dex2oat_return_codes.h b/dex2oat/include/dex2oat_return_codes.h
deleted file mode 100644
index 631ecb9..0000000
--- a/dex2oat/include/dex2oat_return_codes.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2017 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 ART_DEX2OAT_INCLUDE_DEX2OAT_RETURN_CODES_H_
-#define ART_DEX2OAT_INCLUDE_DEX2OAT_RETURN_CODES_H_
-
-namespace art {
-namespace dex2oat {
-
-enum class ReturnCode : int {
- kNoFailure = 0, // No failure, execution completed successfully.
- kOther = 1, // Some other not closer specified error occurred.
- kCreateRuntime = 2, // Dex2oat failed creating a runtime.
-};
-
-} // namespace dex2oat
-} // namespace art
-
-#endif // ART_DEX2OAT_INCLUDE_DEX2OAT_RETURN_CODES_H_
