summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi-Yo Chiang <yochiang@google.com>2024-03-28 16:20:21 +0800
committerYi-Yo Chiang <yochiang@google.com>2024-03-28 08:25:26 +0000
commitf5c284e8998dd8a085cf027bb518b6c2b84cf744 (patch)
treef4914bb90e8c68de25f0fabb021e00fc126b73b2
parentfe7e3bbb7b70f0a177729621603eb9e255a6b1ba (diff)
downloadmkbootimg-f5c284e8998dd8a085cf027bb518b6c2b84cf744.tar.gz
Cleanup libmkbootimg_abi_checkHEADmastermain
It's no longer used. Test: Presubmit Change-Id: I868b918a42adce1a36043189502c1f0284a858f7
-rw-r--r--Android.bp17
-rw-r--r--include/abi_check/mkbootimg_abi_check.h28
-rw-r--r--mkbootimg_dummy.cpp24
3 files changed, 0 insertions, 69 deletions
diff --git a/Android.bp b/Android.bp
index b94bdf7..cb02c0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,12 +5,6 @@ package {
}
cc_library_headers {
- name: "libmkbootimg_abi_headers",
- vendor_available: true,
- export_include_dirs: ["include"],
-}
-
-cc_library_headers {
name: "bootimg_headers",
vendor_available: true,
recovery_available: true,
@@ -27,16 +21,6 @@ cc_library_headers {
],
}
-cc_library {
- name: "libmkbootimg_abi_check",
- vendor_available: true,
- srcs: [
- "mkbootimg_dummy.cpp",
- ],
- header_libs: ["libmkbootimg_abi_headers"],
- export_header_lib_headers: ["libmkbootimg_abi_headers"],
-}
-
python_defaults {
name: "mkbootimg_defaults",
version: {
@@ -67,7 +51,6 @@ python_binary_host {
],
}
-
python_binary_host {
name: "repack_bootimg",
defaults: ["mkbootimg_defaults"],
diff --git a/include/abi_check/mkbootimg_abi_check.h b/include/abi_check/mkbootimg_abi_check.h
deleted file mode 100644
index d478aba..0000000
--- a/include/abi_check/mkbootimg_abi_check.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2018 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 <bootimg/bootimg.h>
-
-// This header has been created for the following reaons:
-// 1) In order for a change in a user defined type to be classified as API /
-// ABI breaking, it needs to be referenced by an 'exported interface'
-// (in this case the function mkbootimg_dummy).
-// 2) Since 'mkbootimg_dummy' needs to be exported, we need to have it
-// exposed through a public header.
-// 3) It is desirable not to pollute bootimg.h with interfaces which are not
-// 'used' in reality by on device binaries. Furthermore, bootimg.h might
-// be exported by a library in the future, so we must avoid polluting it.
-void mkbootimg_dummy(boot_img_hdr*);
diff --git a/mkbootimg_dummy.cpp b/mkbootimg_dummy.cpp
deleted file mode 100644
index 410d379..0000000
--- a/mkbootimg_dummy.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2018 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 <abi_check/mkbootimg_abi_check.h>
-
-void mkbootimg_dummy(boot_img_hdr* hdr) {
- // TODO: Hack to trigger abi checks, remove this.
- if (hdr) {
- hdr--;
- }
-}