diff options
author | Etienne Cordonnier <ecordonnier@snap.com> | 2023-03-15 17:40:37 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-03-15 15:25:12 -0700 |
commit | 0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838 (patch) | |
tree | 22a291b1e4ee7fa4ebd1186f8fd31e0fe1227f37 /dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch | |
parent | 204dadaf378e44d6c53d3bee1c2a54aaf38d666c (diff) | |
download | meta-clang-0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838.tar.gz |
android-tools: remove recipe and dynamic-layer
The recipe has been patched to remove the clang dependency and moved to meta-openembedded at
https://github.com/openembedded/meta-openembedded/tree/master/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch b/dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch deleted file mode 100644 index ccc7655..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core-debian/hard-code-build-number.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Description: just hard code rather than deal with circular deps | ||
2 | Forwarded: not-needed | ||
3 | --- a/adb/adb.cpp | ||
4 | +++ b/adb/adb.cpp | ||
5 | @@ -44,8 +44,6 @@ | ||
6 | #include <android-base/parsenetaddress.h> | ||
7 | #include <android-base/stringprintf.h> | ||
8 | #include <android-base/strings.h> | ||
9 | -#include <build/version.h> | ||
10 | -#include <platform_tools_version.h> | ||
11 | |||
12 | #include "adb_auth.h" | ||
13 | #include "adb_io.h" | ||
14 | @@ -69,7 +67,7 @@ | ||
15 | "Version %s-%s\n" | ||
16 | "Installed as %s\n", | ||
17 | ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, | ||
18 | - PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str(), | ||
19 | + PLATFORM_TOOLS_VERSION, "debian", | ||
20 | android::base::GetExecutablePath().c_str()); | ||
21 | } | ||
22 | |||
23 | --- a/fastboot/fastboot.cpp | ||
24 | +++ b/fastboot/fastboot.cpp | ||
25 | @@ -58,9 +58,7 @@ | ||
26 | #include <android-base/stringprintf.h> | ||
27 | #include <android-base/strings.h> | ||
28 | #include <android-base/unique_fd.h> | ||
29 | -#include <build/version.h> | ||
30 | #include <liblp/liblp.h> | ||
31 | -#include <platform_tools_version.h> | ||
32 | #include <sparse/sparse.h> | ||
33 | #include <ziparchive/zip_archive.h> | ||
34 | |||
35 | @@ -1680,7 +1678,7 @@ | ||
36 | setvbuf(stdout, nullptr, _IONBF, 0); | ||
37 | setvbuf(stderr, nullptr, _IONBF, 0); | ||
38 | } else if (name == "version") { | ||
39 | - fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, android::build::GetBuildNumber().c_str()); | ||
40 | + fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian"); | ||
41 | fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str()); | ||
42 | return 0; | ||
43 | #if !defined(_WIN32) | ||